diff options
| author | Henry Jameson <me@hjkos.com> | 2024-02-19 15:11:59 +0200 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2024-02-19 15:11:59 +0200 |
| commit | 11fd220734ae697e8157d25fbf4cdfc250fe2df7 (patch) | |
| tree | 93c476c9ed387d48456aff75c4d31eebd311f7b8 /src/services/theme_data/theme_data_3.service.js | |
| parent | ab63ec1471964aaf8ffc3d65412b54b173fc5b9e (diff) | |
chat styles + related improvements
Diffstat (limited to 'src/services/theme_data/theme_data_3.service.js')
| -rw-r--r-- | src/services/theme_data/theme_data_3.service.js | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js index a73d4cb5..cd23908c 100644 --- a/src/services/theme_data/theme_data_3.service.js +++ b/src/services/theme_data/theme_data_3.service.js @@ -17,7 +17,9 @@ const components = { Link: null, Icon: null, Border: null, - Panel: null + Panel: null, + Chat: null, + ChatMessage: null } // Loading all style.js[on] files dynamically @@ -509,17 +511,11 @@ export const init = (extraRuleset, palette) => { }) } else { computed[selector] = computed[selector] || {} - let addRuleNeeded = false // TODO: DEFAULT TEXT COLOR const lowerLevelStackedBackground = stacked[lowerLevelSelector] || convert('#FF00FF').rgb - if (computedDirectives.shadow != null || computedDirectives.roundness != null) { - addRuleNeeded = true - } - if (computedDirectives.background) { - addRuleNeeded = true let inheritRule = null const variantRules = ruleset.filter(findRules({ component: component.name, variant: combination.variant, parent })) const lastVariantRule = variantRules[variantRules.length - 1] @@ -564,15 +560,13 @@ export const init = (extraRuleset, palette) => { dynamicVars.stacked = lowerLevelStackedBackground dynamicVars.background = computed[selector].background - if (addRuleNeeded) { - addRule({ - selector: cssSelector, - component: component.name, - ...combination, - parent, - directives: computedDirectives - }) - } + addRule({ + selector: cssSelector, + component: component.name, + ...combination, + parent, + directives: computedDirectives + }) } innerComponents.forEach(innerComponent => { @@ -645,15 +639,15 @@ export const init = (extraRuleset, palette) => { case 'background': { if (v === 'transparent') { return [ - 'background-color: ' + v, + rule.directives.backgroundNoCssColor !== 'yes' ? ('background-color: ' + v) : '', ' --background: ' + v - ].join(';\n') + ].filter(x => x).join(';\n') } const color = cssColorString(computed[selector].background, rule.directives.opacity) return [ - 'background-color: ' + color, + rule.directives.backgroundNoCssColor !== 'yes' ? ('background-color: ' + color) : '', ' --background: ' + color - ].join(';\n') + ].filter(x => x).join(';\n') } case 'textColor': { if (rule.directives.textNoCssColor === 'yes') { return '' } |
