From 43bddc79e0abc35fd310d9a92051bb2d5b529984 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 11 Feb 2020 01:13:59 +0200
Subject: [PATCH] fix/remove contrast ratios
---
src/components/style_switcher/style_switcher.vue | 6 +-----
src/services/theme_data/pleromafe.js | 6 +++++-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/components/style_switcher/style_switcher.vue b/src/components/style_switcher/style_switcher.vue
index 705a60a2..205f325c 100644
--- a/src/components/style_switcher/style_switcher.vue
+++ b/src/components/style_switcher/style_switcher.vue
@@ -252,9 +252,8 @@
name="postLinkColor"
:fallback="previewTheme.colors.accent"
:label="$t('settings.links')"
- :show-optional-tickbox="typeof accentColorLocal !== 'undefined'"
/>
- <ContrastRatio :contrast="previewContrast.bgPostLink" />
+ <ContrastRatio :contrast="previewContrast.postLink" />
<h4>{{ $t('settings.style.advanced_colors.alert') }}</h4>
<ColorInput
v-model="alertErrorColorLocal"
@@ -485,21 +484,18 @@
:fallback="previewTheme.colors.btnDisabledText"
:label="$t('settings.text')"
/>
- <ContrastRatio :contrast="previewContrast.btnDisabledText" />
<ColorInput
v-model="btnDisabledPanelTextColorLocal"
name="btnDisabledPanelTextColor"
:fallback="previewTheme.colors.btnDisabledPanelText"
:label="$t('settings.style.advanced_colors.panel_header')"
/>
- <ContrastRatio :contrast="previewContrast.btnDisabledPanelText" />
<ColorInput
v-model="btnDisabledTopBarTextColorLocal"
name="btnDisabledTopBarTextColor"
:fallback="previewTheme.colors.btnDisabledTopBarText"
:label="$t('settings.style.advanced_colors.top_bar')"
/>
- <ContrastRatio :contrast="previewContrast.btnDisabledTopBarText" />
<h4>{{ $t('settings.style.advanced_colors.toggled') }}</h4>
<ColorInput
v-model="btnToggledColorLocal"
diff --git a/src/services/theme_data/pleromafe.js b/src/services/theme_data/pleromafe.js
index 98fba5ef..9b33e4a9 100644
--- a/src/services/theme_data/pleromafe.js
+++ b/src/services/theme_data/pleromafe.js
@@ -329,11 +329,15 @@ export const SLOT_INHERITANCE = {
lightText: {
depends: ['text'],
+ layer: 'bg',
+ textColor: 'preserve',
color: (mod, text) => brightness(20 * mod, text).rgb
},
postLink: {
- depends: ['link']
+ depends: ['link'],
+ layer: 'bg',
+ textColor: 'preserve'
},
border: {