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

blur support, fix toggled buttons not working right

Browse source
This commit is contained in:
Henry Jameson 2024-02-22 15:15:08 +02:00
commit 779b3dc122
4 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/services/theme_data/css_utils.js
View file

@ -108,10 +108,21 @@ export const getCssRules = (rules) => rules.map(rule => {
].filter(x => x).join(';\n')
}
const color = getCssColorString(rule.dynamicVars.background, rule.directives.opacity)
return [
rule.directives.backgroundNoCssColor !== 'yes' ? ('background-color: ' + color) : '',
' --background: ' + color
].filter(x => x).join(';\n')
const cssDirectives = ['--background: ' + color]
if (rule.directives.backgroundNoCssColor !== 'yes') {
cssDirectives.push('background-color: ' + color)
}
return cssDirectives.filter(x => x).join(';\n')
}
case 'blur': {
const cssDirectives = []
if (rule.directives.opacity < 1) {
cssDirectives.push(`--backdrop-filter: blur(${v}) `)
if (rule.directives.backgroundNoCssColor !== 'yes') {
cssDirectives.push(`backdrop-filter: blur(${v}) `)
}
}
return cssDirectives.join(';\n')
}
case 'textColor': {
if (rule.directives.textNoCssColor === 'yes') { return '' }

5
src/services/theme_data/theme2_to_theme3.js
View file

@ -193,7 +193,6 @@ export const convertTheme2To3 = (data) => {
newRules.push({ ...rule, component: 'Tab' })
}
})
console.log(newRules)
return newRules
}
@ -424,12 +423,12 @@ export const convertTheme2To3 = (data) => {
case 'alert': {
const hasPanel = variantArray.find(x => x === 'Panel')
if (hasPanel) {
rule.parent = { component: 'PanelHeader' }
newRule.parent = { component: 'PanelHeader' }
variantArray = variantArray.filter(x => x !== 'Panel')
}
const hasTop = variantArray.find(x => x === 'Top') // TopBar
if (hasTop) {
rule.parent = { component: 'TopBar' }
newRule.parent = { component: 'TopBar' }
variantArray = variantArray.filter(x => x !== 'Top' && x !== 'Bar')
}
break