From 943ee062fe2c0344165e28f4d612176878159133 Mon Sep 17 00:00:00 2001 From: Volpeon Date: Mon, 21 Jul 2025 16:03:52 +0200 Subject: Consolidating button, action-button and badge; change design to have some 3D components --- src/objects/_action-button.vars.scss | 176 ++++++++++++++++++++++++++++------- 1 file changed, 144 insertions(+), 32 deletions(-) (limited to 'src/objects/_action-button.vars.scss') diff --git a/src/objects/_action-button.vars.scss b/src/objects/_action-button.vars.scss index 8c3d510..1a9be25 100644 --- a/src/objects/_action-button.vars.scss +++ b/src/objects/_action-button.vars.scss @@ -4,32 +4,38 @@ @use '../core.vars' as core; $line-height: props.def(--o-action-button--line-height, 1.4) !default; -$pad-i: props.def(--o-action-button--pad-i, props.get(core.$size--150)) !default; -$pad-i-label: props.def(--o-action-button--pad-i-label, props.get(core.$size--50)) !default; -$pad-i-pill: props.def(--o-action-button--pad-i-pill, props.get(core.$size--200)) !default; -$pad-b: props.def(--o-action-button--pad-b, props.get(core.$size--85)) !default; $border-width: props.def(--o-action-button--border-width, props.get(core.$border-width--thin)) !default; $rounding: props.def(--o-action-button--rounding, props.get(core.$rounding)) !default; -$font-size: props.def(--o-action-button--font-size, props.get(core.$font-size--100)) !default; -$pad-i--sm: props.def(--o-action-button--sm--pad-i, props.get(core.$size--100)) !default; +$pad-i--sm: props.def(--o-action-button--sm--pad-i, props.get(core.$size--75)) !default; $pad-i-label--sm: props.def(--o-action-button--sm--pad-i-label, props.get(core.$size--25)) !default; -$pad-i-pill--sm: props.def(--o-action-button--sm--pad-i-pill, props.get(core.$size--150)) !default; +$pad-i-pill--sm: props.def(--o-action-button--sm--pad-i-pill, props.get(core.$size--100)) !default; $pad-b--sm: props.def(--o-action-button--sm--pad-b, props.get(core.$size--40)) !default; $font-size--sm: props.def(--o-action-button--sm--font-size, props.get(core.$font-size--75)) !default; -$pad-i--lg: props.def(--o-action-button--lg--pad-i, props.get(core.$size--175)) !default; -$pad-i-label--lg: props.def(--o-action-button--lg--pad-i-label, props.get(core.$size--100)) !default; -$pad-i-pill--lg: props.def(--o-action-button--lg--pad-i-pill, props.get(core.$size--250)) !default; +$pad-i: props.def(--o-action-button--pad-i, props.get(core.$size--100)) !default; +$pad-i-label: props.def(--o-action-button--pad-i-label, props.get(core.$size--50)) !default; +$pad-i-pill: props.def(--o-action-button--pad-i-pill, props.get(core.$size--150)) !default; +$pad-b: props.def(--o-action-button--pad-b, props.get(core.$size--85)) !default; +$font-size: props.def(--o-action-button--font-size, props.get(core.$font-size--100)) !default; + +$pad-i--lg: props.def(--o-action-button--lg--pad-i, props.get(core.$size--150)) !default; +$pad-i-label--lg: props.def(--o-action-button--lg--pad-i-label, props.get(core.$size--75)) !default; +$pad-i-pill--lg: props.def(--o-action-button--lg--pad-i-pill, props.get(core.$size--175)) !default; $pad-b--lg: props.def(--o-action-button--lg--pad-b, props.get(core.$size--115)) !default; $font-size--lg: props.def(--o-action-button--lg--font-size, props.get(core.$font-size--150)) !default; -$pad-i--xl: props.def(--o-action-button--xl--pad-i, props.get(core.$size--225)) !default; -$pad-i-label--xl: props.def(--o-action-button--xl--pad-i-label, props.get(core.$size--150)) !default; -$pad-i-pill--xl: props.def(--o-action-button--xl--pad-i-pill, props.get(core.$size--300)) !default; +$pad-i--xl: props.def(--o-action-button--xl--pad-i, props.get(core.$size--175)) !default; +$pad-i-label--xl: props.def(--o-action-button--xl--pad-i-label, props.get(core.$size--100)) !default; +$pad-i-pill--xl: props.def(--o-action-button--xl--pad-i-pill, props.get(core.$size--225)) !default; $pad-b--xl: props.def(--o-action-button--xl--pad-b, props.get(core.$size--150)) !default; $font-size--xl: props.def(--o-action-button--xl--font-size, props.get(core.$font-size--200)) !default; +$shadow-x: props.def(--o-action-button--shadow-x, props.get(core.$shadow--l1--x)) !default; +$shadow-y: props.def(--o-action-button--shadow-y, props.get(core.$shadow--l1--y)) !default; +$shadow-blur: props.def(--o-action-button--shadow-blur, props.get(core.$shadow--l1--blur)) !default; +$shadow-grow: props.def(--o-action-button--shadow-grow, props.get(core.$shadow--l1--grow)) !default; + $key-focus--border-width: props.def(--o-action-button--key-focus--border-width, props.get(core.$key-focus--border-width)) !default; $key-focus--border-offset: props.def(--o-action-button--key-focus--border-offset, props.get(core.$key-focus--border-offset)) !default; $key-focus--outline-width: props.def(--o-action-button--key-focus--outline-width, props.get(core.$key-focus--outline-width)) !default; @@ -44,24 +50,25 @@ $themes: props.def(--o-action-button, (), 'color'); $default-theme-override: () !default; $default-theme: map.deep-merge(( - --bg-color: props.get(core.$theme, --base, --75), - --label-color: props.get(core.$theme, --text), - --border-color: props.get(core.$theme, --border-strong), + --bg-color: props.get(core.$theme, --bg-l2), + --label-color: props.get(core.$theme, --text), + --border-color: props.get(core.$theme, --border-mute) props.get(core.$theme, --border-mute) props.get(core.$theme, --border), + --shadow-color: props.get(core.$theme, --shadow), --hover: ( --bg-color: props.get(core.$theme, --border-mute), --label-color: props.get(core.$theme, --heading), - --border-color: props.get(core.$theme, --text-mute-more), + --border-color: props.get(core.$theme, --border-strong), ), --active: ( --bg-color: props.get(core.$theme, --border), --label-color: props.get(core.$theme, --heading), - --border-color: props.get(core.$theme, --text-mute), + --border-color: props.get(core.$theme, --text-mute-more), ), --disabled: ( - --bg-color: props.get(core.$theme, --bg-l1), + --bg-color: transparent, --label-color: props.get(core.$theme, --border-strong), --border-color: props.get(core.$theme, --border), ), @@ -72,20 +79,20 @@ $default-theme: map.deep-merge(( ), --selected: ( - --bg-color: props.get(core.$theme, --heading), + --bg-color: props.get(core.$theme, --text), --label-color: props.get(core.$theme, --base, --50), - --border-color: props.get(core.$theme, --heading), + --border-color: props.get(core.$theme, --text) props.get(core.$theme, --text) props.get(core.$theme, --heading), --hover: ( - --bg-color: props.get(core.$theme, --text), + --bg-color: props.get(core.$theme, --heading), --label-color: props.get(core.$theme, --base, --50), - --border-color: props.get(core.$theme, --text), + --border-color: props.get(core.$theme, --heading), ), --active: ( - --bg-color: props.get(core.$theme, --text-mute), + --bg-color: props.get(core.$theme, --heading), --label-color: props.get(core.$theme, --base, --50), - --border-color: props.get(core.$theme, --text-mute), + --border-color: props.get(core.$theme, --heading), ), --disabled: ( @@ -115,25 +122,47 @@ $default-theme: map.deep-merge(( ), $default-theme-override) !default; $default-theme: props.def(--o-action-button, $default-theme, 'color'); +$default-theme-dark-override: () !default; +$default-theme-dark: map.deep-merge(( + --bg-color: props.get(core.$theme, --border-mute), + --border-color: props.get(core.$theme, --border-mute), + + --hover: ( + --bg-color: props.get(core.$theme, --border), + --border-color: props.get(core.$theme, --border), + ), + + --active: ( + --bg-color: props.get(core.$theme, --border-strong), + --border-color: props.get(core.$theme, --border-strong), + ), + + --selected: ( + --border-color: props.get(core.$theme, --text), + ), +), $default-theme-override) !default; +$default-theme-dark: props.def(--o-action-button, $default-theme-dark, 'dark'); + @each $theme in map.keys(props.get(core.$transparent-colors)) { $button-theme: --static-#{string.slice($theme, 3)}; $themes: props.merge($themes, ( $button-theme: ( - --bg-color: props.get(core.$transparent-colors, $theme, --100), + --bg-color: props.get(core.$transparent-colors, $theme, --200), --label-color: props.get(core.$transparent-colors, $theme, --900), - --border-color: props.get(core.$transparent-colors, $theme, --400), + --border-color: props.get(core.$transparent-colors, $theme, --300) props.get(core.$transparent-colors, $theme, --300) props.get(core.$transparent-colors, $theme, --400), + --shadow-color: props.get(core.$transparent-colors, --black, --200), --hover: ( --bg-color: props.get(core.$transparent-colors, $theme, --300), --label-color: props.get(core.$transparent-colors, $theme, --900), - --border-color: props.get(core.$transparent-colors, $theme, --500), + --border-color: props.get(core.$transparent-colors, $theme, --400), ), --active: ( --bg-color: props.get(core.$transparent-colors, $theme, --400), --label-color: props.get(core.$transparent-colors, $theme, --900), - --border-color: props.get(core.$transparent-colors, $theme, --600), + --border-color: props.get(core.$transparent-colors, $theme, --500), ), --disabled: ( @@ -150,7 +179,7 @@ $default-theme: props.def(--o-action-button, $default-theme, 'color'); --selected: ( --bg-color: props.get(core.$transparent-colors, $theme, --800), --label-color: props.get(core.$transparent-colors, $theme, --text), - --border-color: props.get(core.$transparent-colors, $theme, --100), + --border-color: props.get(core.$transparent-colors, $theme, --100) props.get(core.$transparent-colors, $theme, --100) props.get(core.$transparent-colors, $theme, --200), --hover: ( --bg-color: props.get(core.$transparent-colors, $theme, --900), @@ -175,12 +204,12 @@ $default-theme: props.def(--o-action-button, $default-theme, 'color'); --label-color: props.get(core.$transparent-colors, $theme, --900), --hover: ( - --bg-color: props.get(core.$transparent-colors, $theme, --300), + --bg-color: props.get(core.$transparent-colors, $theme, --200), --label-color: props.get(core.$transparent-colors, $theme, --900), ), --active: ( - --bg-color: props.get(core.$transparent-colors, $theme, --400), + --bg-color: props.get(core.$transparent-colors, $theme, --300), --label-color: props.get(core.$transparent-colors, $theme, --900), ), @@ -191,3 +220,86 @@ $default-theme: props.def(--o-action-button, $default-theme, 'color'); ) )); } + +$themes-config: ( + accent: --accent, + positive: --positive, + negative: --negative, + warning: --warning, +) !default; + +@each $theme, $key in $themes-config { + $themes: props.merge($themes, ( + --#{$theme}: ( + --bg-color: props.get(core.$theme, $key, --200), + --label-color: props.get(core.$theme, $key, --1100), + --border-color: props.get(core.$theme, $key, --500) props.get(core.$theme, $key, --500) props.get(core.$theme, $key, --600), + --shadow-color: props.get(core.$theme, $key, --200), + + --hover: ( + --bg-color: props.get(core.$theme, $key, --300), + --label-color: props.get(core.$theme, $key, --1200), + --border-color: props.get(core.$theme, $key, --600), + ), + + --active: ( + --bg-color: props.get(core.$theme, $key, --400), + --label-color: props.get(core.$theme, $key, --1300), + --border-color: props.get(core.$theme, $key, --800), + ), + + --disabled: ( + --bg-color: props.get(core.$theme, --bg-l1), + --label-color: props.get(core.$theme, --border-strong), + --border-color: props.get(core.$theme, --border), + ), + + --key-focus: ( + --border-color: props.get(core.$theme, --focus, --border), + --outline-color: props.get(core.$theme, --focus, --outline), + ), + + --selected: ( + --bg-color: props.get(core.$theme, #{$key}-static, --900), + --label-color: props.get(core.$theme, #{$key}-static, --900-text), + --border-color: props.get(core.$theme, #{$key}-static, --900) props.get(core.$theme, #{$key}-static, --900) props.get(core.$theme, #{$key}-static, --1000), + + --hover: ( + --bg-color: props.get(core.$theme, #{$key}-static, --1000), + --label-color: props.get(core.$theme, #{$key}-static, --1000-text), + --border-color: props.get(core.$theme, #{$key}-static, --1000), + ), + + --active: ( + --bg-color: props.get(core.$theme, #{$key}-static, --1100), + --label-color: props.get(core.$theme, #{$key}-static, --1100-text), + --border-color: props.get(core.$theme, #{$key}-static, --1100), + ), + + --disabled: ( + --bg-color: props.get(core.$theme, --border-mute), + --label-color: props.get(core.$theme, --border-strong), + --border-color: props.get(core.$theme, --border-mute), + ), + ), + + --quiet: ( + --label-color: props.get(core.$theme, $key, --1100), + + --hover: ( + --bg-color: props.get(core.$theme, $key, --200), + --label-color: props.get(core.$theme, $key, --1200), + ), + + --active: ( + --bg-color: props.get(core.$theme, $key, --300), + --label-color: props.get(core.$theme, $key, --1300), + ), + + --disabled: ( + --label-color: props.get(core.$theme, --border-strong), + ), + ), + ) + )); +} -- cgit v1.3.1