aboutsummaryrefslogtreecommitdiff
path: root/src/services
diff options
context:
space:
mode:
Diffstat (limited to 'src/services')
-rw-r--r--src/services/color_convert/color_convert.js6
-rw-r--r--src/services/theme_data/theme_data.service.js8
2 files changed, 7 insertions, 7 deletions
diff --git a/src/services/color_convert/color_convert.js b/src/services/color_convert/color_convert.js
index 576bf902..c727a9fe 100644
--- a/src/services/color_convert/color_convert.js
+++ b/src/services/color_convert/color_convert.js
@@ -1,4 +1,4 @@
-import { invertLightness, convert, contrastRatio } from 'chromatism'
+import { invertLightness, contrastRatio } from 'chromatism'
// useful for visualizing color when debugging
export const consoleColor = (color) => console.log('%c##########', 'background: ' + color + '; color: ' + color)
@@ -185,8 +185,8 @@ export const rgba2css = function (rgba) {
* @param {Boolean} preserve - try to preserve intended text color's hue/saturation (i.e. no BW)
*/
export const getTextColor = function (bg, text, preserve) {
- const bgIsLight = convert(bg).hsl.l > 50
- const textIsLight = convert(text).hsl.l > 50
+ const bgIsLight = relativeLuminance(bg) > 0.5
+ const textIsLight = relativeLuminance(text) > 0.5
if ((bgIsLight && textIsLight) || (!bgIsLight && !textIsLight)) {
const base = typeof text.a !== 'undefined' ? { a: text.a } : {}
diff --git a/src/services/theme_data/theme_data.service.js b/src/services/theme_data/theme_data.service.js
index 297d0223..e2e9331c 100644
--- a/src/services/theme_data/theme_data.service.js
+++ b/src/services/theme_data/theme_data.service.js
@@ -159,13 +159,13 @@ export const SLOT_INHERITANCE = {
alertError: '--cRed',
alertErrorText: {
- depends: ['text', 'alertError'],
+ depends: ['text'],
layer: 'alert',
variant: 'alertError',
textColor: true
},
alertErrorPanelText: {
- depends: ['panelText', 'alertError'],
+ depends: ['panelText'],
layer: 'alertPanel',
variant: 'alertError',
textColor: true
@@ -173,13 +173,13 @@ export const SLOT_INHERITANCE = {
alertWarning: '--cOrange',
alertWarningText: {
- depends: ['text', 'alertWarning'],
+ depends: ['text'],
layer: 'alert',
variant: 'alertWarning',
textColor: true
},
alertWarningPanelText: {
- depends: ['panelText', 'alertWarning'],
+ depends: ['panelText'],
layer: 'alertPanel',
variant: 'alertWarning',
textColor: true