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

Merge remote-tracking branch 'origin/develop' into bookmark-folders

Browse source
This commit is contained in:
marcin mikołajczak 2024-09-24 00:38:55 +02:00
commit 1097b95fa5
6 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/components/button_unstyled.style.js
View file

@ -16,7 +16,8 @@ export default {
{
directives: {
background: '#ffffff',
opacity: 0
opacity: 0,
shadow: []
}
},
{

3
src/components/panel_header.style.js
View file

@ -16,7 +16,8 @@ export default {
component: 'PanelHeader',
directives: {
backgroundNoCssColor: 'yes',
background: '--fg'
background: '--fg',
shadow: []
}
}
]

6
src/services/theme_data/iss_deserializer.js
View file

@ -138,7 +138,11 @@ export const deserialize = (input) => {
const [property, value] = d.split(':')
let realValue = value.trim()
if (property === 'shadow') {
realValue = value.split(',').map(v => parseShadow(v.trim()))
if (realValue === 'none') {
realValue = []
} else {
realValue = value.split(',').map(v => parseShadow(v.trim()))
}
} if (!Number.isNaN(Number(value))) {
realValue = Number(value)
}

6
src/services/theme_data/iss_serializer.js
View file

@ -32,7 +32,11 @@ export const serialize = (ruleset) => {
} else {
switch (directive) {
case 'shadow':
return ` ${directive}: ${value.map(serializeShadow).join(', ')}`
if (value.length > 0) {
return ` ${directive}: ${value.map(serializeShadow).join(', ')}`
} else {
return ` ${directive}: none`
}
default:
return ` ${directive}: ${value}`
}