aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2024-02-07 16:15:25 +0200
committerHenry Jameson <me@hjkos.com>2024-02-07 16:15:25 +0200
commit85d55c55e76edfd7661b259d12618e71669ee2d2 (patch)
treeda2c1dcde30e80b22f591468ce6bbe65377e9688 /src
parenta9efbd2553119598e615f718037ea57696d023f6 (diff)
add directive to completely disable automatic text color creation
Diffstat (limited to 'src')
-rw-r--r--src/components/icon.style.js3
-rw-r--r--src/services/theme_data/theme_data_3.service.js15
2 files changed, 11 insertions, 7 deletions
diff --git a/src/components/icon.style.js b/src/components/icon.style.js
index adc72fc5..67b8abb5 100644
--- a/src/components/icon.style.js
+++ b/src/components/icon.style.js
@@ -8,7 +8,8 @@ export default {
directives: {
textColor: '--text',
textOpacity: 0.5,
- textOpacityMode: 'mixrgb'
+ textOpacityMode: 'mixrgb',
+ textAuto: 'no-auto'
}
}
]
diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js
index c1f8c730..e9bee453 100644
--- a/src/services/theme_data/theme_data_3.service.js
+++ b/src/services/theme_data/theme_data_3.service.js
@@ -392,12 +392,15 @@ export const init = (extraRuleset, palette) => {
const lowerLevelSelector = selector.split(/ /g).slice(0, -1).join(' ')
const lowerLevelBackground = cache[lowerLevelSelector].background
- const textColor = getTextColor(
- convert(lowerLevelBackground).rgb,
- // TODO properly provide "parent" text color?
- convert(findColor(inheritedTextColor, null, lowerLevelBackground)).rgb,
- newTextRule.directives.textAuto === 'preserve'
- )
+ // TODO properly provide "parent" text color?
+ const intendedTextColor = convert(findColor(inheritedTextColor, null, lowerLevelBackground)).rgb
+ const textColor = newTextRule.directives.textAuto === 'no-auto'
+ ? intendedTextColor
+ : getTextColor(
+ convert(lowerLevelBackground).rgb,
+ intendedTextColor,
+ newTextRule.directives.textAuto === 'preserve'
+ )
// Storing color data in lower layer to use as custom css properties
cache[lowerLevelSelector].textDefined = cache[lowerLevelSelector].textDefined || {}