From 6811191147c6e7eacdff580cdf291538e7df6e5e Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 19 Feb 2024 00:10:10 +0200 Subject: [PATCH] i'm stupid --- src/components/attachment.style.js | 23 ------------------- src/components/attachment/attachment.style.js | 8 +++++++ .../theme_data/theme_data_3.service.js | 6 ++--- 3 files changed, 11 insertions(+), 26 deletions(-) delete mode 100644 src/components/attachment.style.js diff --git a/src/components/attachment.style.js b/src/components/attachment.style.js deleted file mode 100644 index b6c5da6e23..0000000000 --- a/src/components/attachment.style.js +++ /dev/null @@ -1,23 +0,0 @@ -export default { - name: 'Attachment', - selector: '.Attachment', - validInnerComponents: [ - 'Border', - 'ButtonUnstyled' - ], - defaultRules: [ - { - directives: { - roundness: 3 - } - }, - { - component: 'ButtonUnstyled', - parent: { component: 'Attachment' }, - directives: { - background: '#FFFFFF', - opacity: 0.9 - } - } - ] -} diff --git a/src/components/attachment/attachment.style.js b/src/components/attachment/attachment.style.js index b76b3eb061..74e355c4ea 100644 --- a/src/components/attachment/attachment.style.js +++ b/src/components/attachment/attachment.style.js @@ -10,6 +10,14 @@ export default { directives: { roundness: 3 } + }, + { + component: 'ButtonUnstyled', + parent: { component: 'Attachment' }, + directives: { + background: '#FFFFFF', + opacity: 0.5 + } } ] } diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js index 84ff20b2c1..5d3f4e8b0e 100644 --- a/src/services/theme_data/theme_data_3.service.js +++ b/src/services/theme_data/theme_data_3.service.js @@ -169,6 +169,7 @@ export const init = (extraRuleset, palette) => { return rule }) + console.log(rulesetUnsorted) const ruleset = rulesetUnsorted .map((data, index) => ({ data, index })) @@ -187,6 +188,8 @@ export const init = (extraRuleset, palette) => { }) .map(({ data }) => data) + console.log(ruleset.filter(c => c.component === 'ButtonUnstyled')) + const virtualComponents = new Set(Object.values(components).filter(c => c.virtual).map(c => c.name)) const findColor = (color, dynamicVars) => { @@ -196,8 +199,6 @@ export const init = (extraRuleset, palette) => { const [variable, modifier] = color.split(/,/g).map(str => str.trim()) const variableSlot = variable.substring(2) if (variableSlot === 'stack') { - console.log(dynamicVars) - console.log(stacked) const { r, g, b } = dynamicVars.stacked targetColor = { r, g, b } } else if (variableSlot.startsWith('parent')) { @@ -660,7 +661,6 @@ export const init = (extraRuleset, palette) => { } default: if (k.startsWith('--')) { - console.log('LOL', k, rgba2css(findColor(v, computed[selector].dynamicVars))) return k + ': ' + rgba2css(findColor(v, computed[selector].dynamicVars)) } return ''