diff --git a/src/components/select/select_motion.vue b/src/components/select/select_motion.vue index 38d3f261a..45e278fc6 100644 --- a/src/components/select/select_motion.vue +++ b/src/components/select/select_motion.vue @@ -49,9 +49,27 @@ diff --git a/src/components/settings_modal/tabs/style_tab/style_tab.js b/src/components/settings_modal/tabs/style_tab/style_tab.js index cba21a0c7..a612f5a9e 100644 --- a/src/components/settings_modal/tabs/style_tab/style_tab.js +++ b/src/components/settings_modal/tabs/style_tab/style_tab.js @@ -391,6 +391,7 @@ export default { return deserializeShadow(shadow) } catch (e) { console.warn(e) + return shadow } } return null @@ -703,7 +704,6 @@ export default { if (selectedState.size > 0) { selectedState.forEach(state => { const original = selectedComponent.value.states[state] - console.log('ORIG', original) selectors.push(simulatePseudoSelectors(original)) }) } diff --git a/src/components/settings_modal/tabs/style_tab/virtual_directives_tab.vue b/src/components/settings_modal/tabs/style_tab/virtual_directives_tab.vue index 65c5e2f12..cf3345e58 100644 --- a/src/components/settings_modal/tabs/style_tab/virtual_directives_tab.vue +++ b/src/components/settings_modal/tabs/style_tab/virtual_directives_tab.vue @@ -1,83 +1,83 @@ - - - {{ $t('settings.style.themes3.editor.variables.label') }} - {{ ' ' }} - - + - + - {{ p.name }} - - - emit('update:modelValue', e)" - :selected-id="selectedVirtualDirectiveId" - @update:selectedId="e => selectedVirtualDirectiveId = e" - :get-add-value="getNewVirtualDirective" - /> - - - - {{ $t('settings.style.themes3.editor.variables.name_label') }} - {{ ' ' }} - - - - {{ $t('settings.style.themes3.editor.variables.type_label') }} - {{ ' ' }} - - - - {{ $t('settings.style.themes3.editor.variables.type_shadow') }} - - - {{ $t('settings.style.themes3.editor.variables.type_color') }} - - - {{ $t('settings.style.themes3.editor.variables.type_generic') }} - - + {{ p.name }} + + + emit('update:modelValue', e)" + :selected-id="selectedVirtualDirectiveId" + @update:selectedId="e => selectedVirtualDirectiveId = e" + :get-add-value="getNewVirtualDirective" + /> + + + + {{ $t('settings.style.themes3.editor.variables.name_label') }} + {{ ' ' }} + + + + {{ $t('settings.style.themes3.editor.variables.type_label') }} + {{ ' ' }} + + + + {{ $t('settings.style.themes3.editor.variables.type_shadow') }} + + + {{ $t('settings.style.themes3.editor.variables.type_color') }} + + + {{ $t('settings.style.themes3.editor.variables.type_generic') }} + + + + + - - - diff --git a/src/services/theme_data/theme3_slot_functions.js b/src/services/theme_data/theme3_slot_functions.js index 24652429e..8600217a9 100644 --- a/src/services/theme_data/theme3_slot_functions.js +++ b/src/services/theme_data/theme3_slot_functions.js @@ -23,6 +23,16 @@ export const colorFunctions = { return { ...colorArg, a: amount } } }, + brightness: { + argsNeeded: 2, + exec: (args, { findColor }, { dynamicVars, staticVars }) => { + const [color, amountArg] = args + + const colorArg = convert(findColor(color, { dynamicVars, staticVars })).hsl + colorArg.l += Number(amountArg) + return { ...convert(colorArg).rgb } + } + }, textColor: { argsNeeded: 2, exec: (args, { findColor }, { dynamicVars, staticVars }) => { diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js index 294ba0e95..d25782b40 100644 --- a/src/services/theme_data/theme_data_3.service.js +++ b/src/services/theme_data/theme_data_3.service.js @@ -518,7 +518,7 @@ export const init = ({ combination.component = component.name combination.lazy = component.lazy || parent?.lazy combination.parent = parent - if (combination.state.indexOf('hover') >= 0) { + if (!liteMode && combination.state.indexOf('hover') >= 0) { combination.lazy = true }