diff --git a/src/components/style_switcher/style_switcher.vue b/src/components/style_switcher/style_switcher.vue index 61f8800a..79c2fcd3 100644 --- a/src/components/style_switcher/style_switcher.vue +++ b/src/components/style_switcher/style_switcher.vue @@ -518,27 +518,27 @@ />
-

{{ $t('settings.style.advanced_colors.lightBg') }}

+

{{ $t('settings.style.advanced_colors.highlight') }}

- + - +

{{ $t('settings.style.advanced_colors.selectedPost') }}

diff --git a/src/i18n/en.json b/src/i18n/en.json index 815c11b1..2622157a 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -449,7 +449,7 @@ "underlay": "Underlay", "poll": "Poll graph", "icons": "Icons", - "lightBg": "Highlighted elements", + "highlight": "Highlighted elements", "pressed": "Pressed", "selectedPost": "Selected post", "selectedMenu": "Selected menu item", diff --git a/src/services/theme_data/theme_data.service.js b/src/services/theme_data/theme_data.service.js index 63bfb5af..8c114004 100644 --- a/src/services/theme_data/theme_data.service.js +++ b/src/services/theme_data/theme_data.service.js @@ -47,7 +47,7 @@ export const LAYERS = { badge: null, // no transparency support fg: null, bg: 'underlay', - lightBg: 'bg', + highlight: 'bg', panel: 'bg', btn: 'bg', btnPanel: 'panel', @@ -148,57 +148,57 @@ export const SLOT_INHERITANCE = { cGreen: '#00FF00', cOrange: '#E3FF00', - lightBg: { + highlight: { depends: ['bg'], color: (mod, bg) => brightness(5 * mod, bg).rgb }, - lightBgFaintText: { + highlightFaintText: { depends: ['faint'], - layer: 'lightBg', + layer: 'highlight', textColor: true }, - lightBgFaintLink: { + highlightFaintLink: { depends: ['faintLink'], - layer: 'lightBg', + layer: 'highlight', textColor: 'preserve' }, - lightBgText: { + highlightText: { depends: ['text'], - layer: 'lightBg', + layer: 'highlight', textColor: true }, - lightBgLink: { + highlightLink: { depends: ['link'], - layer: 'lightBg', + layer: 'highlight', textColor: 'preserve' }, - lightBgIcon: { - depends: ['lightBg', 'lightBgText'], + highlightIcon: { + depends: ['highlight', 'highlightText'], color: (mod, bg, text) => mixrgb(bg, text) }, - selectedPost: '--lightBg', + selectedPost: '--highlight', selectedPostFaintText: { - depends: ['lightBgFaintText'], - layer: 'lightBg', + depends: ['highlightFaintText'], + layer: 'highlight', variant: 'selectedPost', textColor: true }, selectedPostFaintLink: { - depends: ['lightBgFaintLink'], - layer: 'lightBg', + depends: ['highlightFaintLink'], + layer: 'highlight', variant: 'selectedPost', textColor: 'preserve' }, selectedPostText: { - depends: ['lightBgText'], - layer: 'lightBg', + depends: ['highlightText'], + layer: 'highlight', variant: 'selectedPost', textColor: true }, selectedPostLink: { - depends: ['lightBgLink'], - layer: 'lightBg', + depends: ['highlightLink'], + layer: 'highlight', variant: 'selectedPost', textColor: 'preserve' }, @@ -207,28 +207,28 @@ export const SLOT_INHERITANCE = { color: (mod, bg, text) => mixrgb(bg, text) }, - selectedMenu: '--lightBg', + selectedMenu: '--highlight', selectedMenuFaintText: { - depends: ['lightBgFaintText'], - layer: 'lightBg', + depends: ['highlightFaintText'], + layer: 'highlight', variant: 'selectedMenu', textColor: true }, selectedMenuFaintLink: { - depends: ['lightBgFaintLink'], - layer: 'lightBg', + depends: ['highlightFaintLink'], + layer: 'highlight', variant: 'selectedMenu', textColor: 'preserve' }, selectedMenuText: { - depends: ['lightBgText'], - layer: 'lightBg', + depends: ['highlightText'], + layer: 'highlight', variant: 'selectedMenu', textColor: true }, selectedMenuLink: { - depends: ['lightBgLink'], - layer: 'lightBg', + depends: ['highlightLink'], + layer: 'highlight', variant: 'selectedMenu', textColor: 'preserve' }, diff --git a/static/themes/breezy-dark.json b/static/themes/breezy-dark.json index 3aafda52..c3bdcf65 100644 --- a/static/themes/breezy-dark.json +++ b/static/themes/breezy-dark.json @@ -114,7 +114,7 @@ "cGreen": "#27ae60", "cOrange": "#f67400", "btnPressed": "--accent", - "lightBg": "--accent", + "highlight": "--accent", "selectedPost": "--bg,10" }, "radii": { diff --git a/static/themes/breezy-light.json b/static/themes/breezy-light.json index df6e1a66..478407c9 100644 --- a/static/themes/breezy-light.json +++ b/static/themes/breezy-light.json @@ -117,7 +117,7 @@ "cGreen": "#27ae60", "cOrange": "#f67400", "btnPressed": "--accent", - "lightBg": "--accent", + "highlight": "--accent", "selectedPost": "--bg,10" }, "radii": { diff --git a/static/themes/redmond-xx-se.json b/static/themes/redmond-xx-se.json index 13ed3b0e..1a867fcc 100644 --- a/static/themes/redmond-xx-se.json +++ b/static/themes/redmond-xx-se.json @@ -283,7 +283,7 @@ "cBlue": "#008080", "cGreen": "#008000", "cOrange": "#808000", - "lightBg": "--accent", + "highlight": "--accent", "selectedPost": "--bg,-10" }, "radii": { diff --git a/static/themes/redmond-xx.json b/static/themes/redmond-xx.json index 7c687ae0..78c92f10 100644 --- a/static/themes/redmond-xx.json +++ b/static/themes/redmond-xx.json @@ -274,7 +274,7 @@ "cBlue": "#008080", "cGreen": "#008000", "cOrange": "#808000", - "lightBg": "--accent", + "highlight": "--accent", "selectedPost": "--bg,-10" }, "radii": { diff --git a/static/themes/redmond-xxi.json b/static/themes/redmond-xxi.json index 5371ee64..28f68351 100644 --- a/static/themes/redmond-xxi.json +++ b/static/themes/redmond-xxi.json @@ -256,7 +256,7 @@ "cBlue": "#6699cc", "cGreen": "#669966", "cOrange": "#cc6633", - "lightBg": "--accent", + "highlight": "--accent", "selectedPost": "--bg,-10" }, "radii": {