Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix

Browse source
This commit is contained in:
Henry Jameson 2018-10-04 18:27:27 +03:00
parent 0a4b07652a
commit 5441766c3c
2 changed files with 7 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/components/style_switcher/style_switcher.js
View file

@ -228,26 +228,9 @@ export default {
const colors = input.colors || input const colors = input.colors || input
const radii = input.radii || input const radii = input.radii || input
if (version === 0) {
if (input.version) version = input.version
// Old v1 naming: fg is text, btn is foreground
if (typeof input.text === 'undefined' && typeof input.fg !== 'undefined') {
version = 1
}
// New v2 naming: text is text, fg is foreground
if (typeof input.text !== 'undefined' && typeof input.fg !== 'undefined') {
version = 2
}
}
this.bgColorLocal = rgb2hex(colors.bg) this.bgColorLocal = rgb2hex(colors.bg)
if (version === 1) { this.fgColorLocal = rgb2hex(colors.fg)
this.fgColorLocal = rgb2hex(colors.btn) this.textColorLocal = rgb2hex(colors.text)
this.textColorLocal = rgb2hex(colors.fg)
} else {
this.fgColorLocal = rgb2hex(colors.fg)
this.textColorLocal = rgb2hex(colors.text)
}
this.linkColorLocal = rgb2hex(colors.link) this.linkColorLocal = rgb2hex(colors.link)
if (version === 1) { if (version === 1) {

28
src/services/style_setter/style_setter.js
View file

@ -110,40 +110,22 @@ const generatePreset = (input) => {
return acc return acc
}, {}) }, {})
let version = 0 colors.text = col.text
if (input.version) {
version = input.version
}
// Old v1 naming: fg is text, btn is foreground
if (typeof col.text === 'undefined' && typeof col.fg !== 'undefined') {
version = 1
}
// New v2 naming: text is text, fg is foreground
if (typeof col.text !== 'undefined' && typeof col.fg !== 'undefined') {
version = 2
}
colors.text = version === 1 ? col.fg : col.text
colors.lightText = colors.text colors.lightText = colors.text
colors.bg = col.bg colors.bg = col.bg
colors.lightBg = col.lightBg || brightness(5, colors.bg).rgb colors.lightBg = col.lightBg || brightness(5, colors.bg).rgb
colors.fg = version === 1 ? col.btn : col.fg colors.fg = col.fg
console.log('BENIN')
console.log(version)
console.log(col)
console.log(colors.text)
colors.fgText = getTextColor(colors.fg, colors.text) colors.fgText = getTextColor(colors.fg, colors.text)
colors.btn = col.btn || { r: 0, g: 0, b: 0 } colors.btn = col.btn || col.fg
colors.btnText = getTextColor(colors.btn, colors.text) colors.btnText = getTextColor(colors.btn, colors.text)
colors.panel = col.panel || col.btn colors.panel = col.panel || col.fg
colors.panelText = getTextColor(colors.panel, colors.text) colors.panelText = getTextColor(colors.panel, colors.text)
colors.topBar = col.topBar || col.btn colors.topBar = col.topBar || col.fg
colors.topBarText = getTextColor(colors.topBar, colors.text) colors.topBarText = getTextColor(colors.topBar, colors.text)
colors.input = col.input || Object.assign({ a: 0.5 }, col.btn) colors.input = col.input || Object.assign({ a: 0.5 }, col.btn)