From 2c839a42252e194699672792c904b445dcb44f7a Mon Sep 17 00:00:00 2001 From: lindsaym-fa Date: Tue, 13 May 2025 16:45:28 -0400 Subject: [PATCH] Remove Awesome's `dimension.css`, re-combine with `overrides.css` --- src/styles/themes/awesome.css | 1 - src/styles/themes/awesome/dimension.css | 78 ------------------------- src/styles/themes/awesome/overrides.css | 78 +++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 79 deletions(-) delete mode 100644 src/styles/themes/awesome/dimension.css diff --git a/src/styles/themes/awesome.css b/src/styles/themes/awesome.css index ab614fb46..91588d8d5 100644 --- a/src/styles/themes/awesome.css +++ b/src/styles/themes/awesome.css @@ -6,7 +6,6 @@ @import url('default/shadows.css'); @import url('default/transitions.css'); @import url('default/groups.css'); -@import url('awesome/dimension.css'); @import url('awesome/overrides.css'); :where(:root), diff --git a/src/styles/themes/awesome/dimension.css b/src/styles/themes/awesome/dimension.css deleted file mode 100644 index 2a056db0f..000000000 --- a/src/styles/themes/awesome/dimension.css +++ /dev/null @@ -1,78 +0,0 @@ -:where(:root), -:host, -.wa-theme-awesome { - :is( - button, - input:where([type='button'], [type='reset'], [type='submit']), - wa-button, - wa-radio-group > wa-radio-button, - .wa-button - ):not([appearance='plain'], .wa-plain) { - --wa-transition-slow: 0; - --wa-transition-normal: 0; - --wa-transition-fast: 0; - - --border-color: var(--text-color); - --border-color-hover: var(--border-color); - --border-color-active: var(--border-color); - box-shadow: var(--wa-shadow-offset-x-s) var(--wa-shadow-offset-y-s) var(--wa-shadow-blur-s) - var(--wa-shadow-spread-s) var(--border-color); - --background-color-active: var(--border-color); - --text-color-active: var(--background-color); - - margin-bottom: var(--wa-shadow-offset-y-s); - - &:is([appearance='outlined'], .wa-outlined) { - --background-color: var(--wa-color-surface-default); - } - - &:not([disabled], [loading]):active, - &::part(checked) { - box-shadow: none; - transform: translateY(var(--wa-shadow-offset-y-s)); - } - - .wa-dark & { - --border-color: var(--wa-color-border-quiet); - } - } - - wa-radio-group > wa-radio-button { - &::part(base) { - --background-color-active: var(--border-color-active); - --border-color-active: var(--wa-color-neutral-border-loud); - --text-color-active: var(--wa-color-surface-default); - } - &::part(checked) { - --background-color: var(--border-color); - --background-color-hover: var(--border-color); - --border-color: var(--wa-color-neutral-border-loud); - --text-color: var(--wa-color-surface-default); - --text-color-hover: var(--text-color); - } - } - :is( - input:where( - :not( - [type='button'], - [type='checkbox'], - [type='color'], - [type='file'], - [type='hidden'], - [type='image'], - [type='radio'], - [type='range'], - [type='reset'], - [type='submit'] - ) - ), - select, - textarea, - wa-input, - wa-select, - wa-textarea, - .wa-text-field - ):not(:focus, [appearance='filled'], .wa-filled) { - --box-shadow: inset var(--wa-shadow-s); - } -} diff --git a/src/styles/themes/awesome/overrides.css b/src/styles/themes/awesome/overrides.css index 183b8ea64..22246e6a9 100644 --- a/src/styles/themes/awesome/overrides.css +++ b/src/styles/themes/awesome/overrides.css @@ -1,6 +1,84 @@ :where(:root), :host, .wa-theme-awesome { + :is( + button, + input:where([type='button'], [type='reset'], [type='submit']), + wa-button, + wa-radio-group > wa-radio-button, + .wa-button + ):not([appearance='plain'], .wa-plain) { + --wa-transition-slow: 0; + --wa-transition-normal: 0; + --wa-transition-fast: 0; + + --border-color: var(--text-color); + --border-color-hover: var(--border-color); + --border-color-active: var(--border-color); + box-shadow: var(--wa-shadow-offset-x-s) var(--wa-shadow-offset-y-s) var(--wa-shadow-blur-s) + var(--wa-shadow-spread-s) var(--border-color); + --background-color-active: var(--border-color); + --text-color-active: var(--background-color); + + margin-bottom: var(--wa-shadow-offset-y-s); + + &:is([appearance='outlined'], .wa-outlined) { + --background-color: var(--wa-color-surface-default); + } + + &:not([disabled], [loading]):active, + &::part(checked) { + box-shadow: none; + transform: translateY(var(--wa-shadow-offset-y-s)); + } + + .wa-dark &, + .wa-invert & { + --border-color: var(--wa-color-border-quiet); + --text-color-active: var(--wa-color-on-quiet); + } + } + + wa-radio-group > wa-radio-button { + &::part(base) { + --background-color-active: var(--border-color-active); + --border-color-active: var(--wa-color-neutral-border-loud); + --text-color-active: var(--wa-color-surface-default); + } + &::part(checked) { + --background-color: var(--border-color); + --background-color-hover: var(--border-color); + --border-color: var(--wa-color-neutral-border-loud); + --text-color: var(--wa-color-surface-default); + --text-color-hover: var(--text-color); + } + } + + :is( + input:where( + :not( + [type='button'], + [type='checkbox'], + [type='color'], + [type='file'], + [type='hidden'], + [type='image'], + [type='radio'], + [type='range'], + [type='reset'], + [type='submit'] + ) + ), + select, + textarea, + wa-input, + wa-select, + wa-textarea, + .wa-text-field + ):not(:focus, [appearance='filled'], .wa-filled) { + --box-shadow: inset var(--wa-shadow-s); + } + wa-badge { border-radius: var(--wa-border-radius-m); font-weight: var(--wa-font-weight-bold);