From 5c878876d3bdd2c7cd094871fa0644f3310bcec8 Mon Sep 17 00:00:00 2001
From: Volpeon <git@volpeon.ink>
Date: Wed, 23 Jul 2025 08:34:23 +0200
Subject: Commit merge of button and badge into action-button (and rename it to
 button)

---
 src/objects/_button.vars.scss | 353 ++++++++++++++++++++++++++++++++----------
 1 file changed, 272 insertions(+), 81 deletions(-)

(limited to 'src/objects/_button.vars.scss')

diff --git a/src/objects/_button.vars.scss b/src/objects/_button.vars.scss
index 4f7b552..1ab7e5a 100644
--- a/src/objects/_button.vars.scss
+++ b/src/objects/_button.vars.scss
@@ -4,164 +4,355 @@
 @use '../core.vars' as core;
 
 $line-height:  props.def(--o-button--line-height, 1.4) !default;
-$pad-i:        props.def(--o-button--pad-i, props.get(core.$size--200)) !default;
-$pad-i-label:  props.def(--o-button--pad-i-label, props.get(core.$size--50)) !default;
-$pad-b:        props.def(--o-button--pad-b, props.get(core.$size--65)) !default;
-$border-width: props.def(--o-button--border-width, props.get(core.$border-width--medium)) !default;
-$rounding:     props.def(--o-button--rounding, 10em) !default;
-$font-size:    props.def(--o-button--font-size, props.get(core.$font-size--100)) !default;
+$border-width: props.def(--o-button--border-width, props.get(core.$border-width--thin)) !default;
+$rounding:     props.def(--o-button--rounding, props.get(core.$rounding--sm)) !default;
 
-$pad-i--sm:       props.def(--o-button--sm--pad-i, props.get(core.$size--150)) !default;
+$pad-i--sm:       props.def(--o-button--sm--pad-i, props.get(core.$size--75)) !default;
 $pad-i-label--sm: props.def(--o-button--sm--pad-i-label, props.get(core.$size--25)) !default;
-$pad-b--sm:       props.def(--o-button--sm--pad-b, props.get(core.$size--25)) !default;
+$pad-i-pill--sm:  props.def(--o-button--sm--pad-i-pill, props.get(core.$size--115)) !default;
+$pad-b--sm:       props.def(--o-button--sm--pad-b, props.get(core.$size--40)) !default;
 $font-size--sm:   props.def(--o-button--sm--font-size, props.get(core.$font-size--75)) !default;
 
-$pad-i--lg:       props.def(--o-button--lg--pad-i, props.get(core.$size--250)) !default;
-$pad-i-label--lg: props.def(--o-button--lg--pad-i-label, props.get(core.$size--100)) !default;
-$pad-b--lg:       props.def(--o-button--lg--pad-b, props.get(core.$size--100)) !default;
+$pad-i:        props.def(--o-button--pad-i, props.get(core.$size--115)) !default;
+$pad-i-label:  props.def(--o-button--pad-i-label, props.get(core.$size--40)) !default;
+$pad-i-pill:   props.def(--o-button--pad-i-pill, props.get(core.$size--150)) !default;
+$pad-b:        props.def(--o-button--pad-b, props.get(core.$size--85)) !default;
+$font-size:    props.def(--o-button--font-size, props.get(core.$font-size--100)) !default;
+
+$pad-i--lg:       props.def(--o-button--lg--pad-i, props.get(core.$size--160)) !default;
+$pad-i-label--lg: props.def(--o-button--lg--pad-i-label, props.get(core.$size--65)) !default;
+$pad-i-pill--lg:  props.def(--o-button--lg--pad-i-pill, props.get(core.$size--175)) !default;
+$pad-b--lg:       props.def(--o-button--lg--pad-b, props.get(core.$size--115)) !default;
 $font-size--lg:   props.def(--o-button--lg--font-size, props.get(core.$font-size--150)) !default;
 
-$pad-i--xl:       props.def(--o-button--xl--pad-i, props.get(core.$size--300)) !default;
-$pad-i-label--xl: props.def(--o-button--xl--pad-i-label, props.get(core.$size--150)) !default;
+$pad-i--xl:       props.def(--o-button--xl--pad-i, props.get(core.$size--200)) !default;
+$pad-i-label--xl: props.def(--o-button--xl--pad-i-label, props.get(core.$size--85)) !default;
+$pad-i-pill--xl:  props.def(--o-button--xl--pad-i-pill, props.get(core.$size--225)) !default;
 $pad-b--xl:       props.def(--o-button--xl--pad-b, props.get(core.$size--150)) !default;
 $font-size--xl:   props.def(--o-button--xl--font-size, props.get(core.$font-size--200)) !default;
 
+$shadow-x:    props.def(--o-button--shadow-x, props.get(core.$shadow--l1--x)) !default;
+$shadow-y:    props.def(--o-button--shadow-y, props.get(core.$shadow--l1--y)) !default;
+$shadow-blur: props.def(--o-button--shadow-blur, props.get(core.$shadow--l1--blur)) !default;
+$shadow-grow: props.def(--o-button--shadow-grow, props.get(core.$shadow--l1--grow)) !default;
+
 $key-focus--border-width:  props.def(--o-button--key-focus--border-width, props.get(core.$key-focus--border-width)) !default;
 $key-focus--border-offset: props.def(--o-button--key-focus--border-offset, props.get(core.$key-focus--border-offset)) !default;
 $key-focus--outline-width: props.def(--o-button--key-focus--outline-width, props.get(core.$key-focus--outline-width)) !default;
 
-$sizes: (
-    'sm' $pad-i--sm $pad-i-label--sm $pad-b--sm $font-size--sm,
-    'lg' $pad-i--lg $pad-i-label--lg $pad-b--lg $font-size--lg,
-    'xl' $pad-i--xl $pad-i-label--xl $pad-b--xl $font-size--xl,
+$fixed-sizes: (
+    'sm' $pad-i--sm $pad-i-label--sm $pad-i-pill--sm $pad-b--sm $font-size--sm,
+    'lg' $pad-i--lg $pad-i-label--lg $pad-i-pill--lg $pad-b--lg $font-size--lg,
+    'xl' $pad-i--xl $pad-i-label--xl $pad-i-pill--xl $pad-b--xl $font-size--xl,
 ) !default;
 
+$themes: props.def(--o-button, (), 'color');
+
 $default-theme-override: () !default;
-$default-theme: props.def(--o-button, (
-    --bg:             props.get(core.$theme, --border-mute),
-    --label:          props.get(core.$theme, --text),
-    --outline-border: props.get(core.$theme, --border),
-    --outline-label:  props.get(core.$theme, --text),
+$default-theme: map.deep-merge((
+    --bg-color:             props.get(core.$theme, --bg-l2),
+    --label-color:          props.get(core.$theme, --text),
+    --border-color:         props.get(core.$theme, --box, --border) props.get(core.$theme, --box, --border) props.get(core.$theme, --box, --border-strong),
+    --shadow-color:         props.get(core.$theme, --shadow),
 
     --hover: (
-        --bg:     props.get(core.$theme, --border),
-        --label:  props.get(core.$theme, --heading),
+        --bg-color:     props.get(core.$theme, --border-mute),
+        --label-color:  props.get(core.$theme, --heading),
+        --border-color: props.get(core.$theme, --border-strong),
     ),
 
     --active: (
-        --bg:     props.get(core.$theme, --border-strong),
-        --label:  props.get(core.$theme, --heading),
+        --bg-color:     props.get(core.$theme, --border),
+        --label-color:  props.get(core.$theme, --heading),
+        --border-color: props.get(core.$theme, --text-mute-more),
     ),
 
     --disabled: (
-        --bg:             props.get(core.$theme, --border-mute),
-        --outline-border: props.get(core.$theme, --border),
-        --label:          props.get(core.$theme, --text-disabled),
+        --bg-color:     transparent,
+        --label-color:  props.get(core.$theme, --border-strong),
+        --border-color: props.get(core.$theme, --border),
     ),
 
     --key-focus: (
-        --label:   props.get(core.$theme, --focus, --text),
-        --border:  props.get(core.$theme, --focus, --border),
-        --outline: props.get(core.$theme, --focus, --outline),
+        --border-color:  props.get(core.$theme, --focus, --border),
+        --outline-color: props.get(core.$theme, --focus, --outline),
+    ),
+
+    --selected: (
+        --bg-color:     props.get(core.$theme, --text),
+        --label-color:  props.get(core.$theme, --base, --50),
+        --border-color: props.get(core.$theme, --text) props.get(core.$theme, --text) props.get(core.$theme, --heading),
+
+        --hover: (
+            --bg-color:     props.get(core.$theme, --heading),
+            --label-color:  props.get(core.$theme, --base, --50),
+            --border-color: props.get(core.$theme, --heading),
+        ),
+
+        --active: (
+            --bg-color:     props.get(core.$theme, --heading),
+            --label-color:  props.get(core.$theme, --base, --50),
+            --border-color: props.get(core.$theme, --heading),
+        ),
+
+        --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),
+        ),
+    ),
+
+    --static: (
+        --bg-color:     props.get(core.$theme, --border-mute),
+        --label-color:  props.get(core.$theme, --heading),
+        --border-color: props.get(core.$theme, --border-mute),
+
+        --hover: (
+            --bg-color:     props.get(core.$theme, --border),
+            --label-color:  props.get(core.$theme, --heading),
+            --border-color: props.get(core.$theme, --border),
+        ),
+
+        --active: (
+            --bg-color:     props.get(core.$theme, --border-strong),
+            --label-color:  props.get(core.$theme, --heading),
+            --border-color: props.get(core.$theme, --border-strong),
+        ),
     ),
 
-    --primary: (
-        --bg:             props.get(core.$theme, --base, --900),
-        --label:          props.get(core.$theme, --base, --900-text),
-        --outline-border: props.get(core.$theme, --base, --900),
-        --outline-label:  props.get(core.$theme, --text),
+    --quiet: (
+        --label-color:  props.get(core.$theme, --text),
 
         --hover: (
-            --bg:     props.get(core.$theme, --base, --800),
-            --label:  props.get(core.$theme, --base, --800-text),
+            --bg-color:    props.get(core.$theme, --border-mute),
+            --label-color: props.get(core.$theme, --heading),
         ),
 
         --active: (
-            --bg:     props.get(core.$theme, --base, --700),
-            --label:  props.get(core.$theme, --base, --700-text),
+            --bg-color:    props.get(core.$theme, --border),
+            --label-color: props.get(core.$theme, --heading),
+        ),
+
+        --disabled: (
+            --label-color: props.get(core.$theme, --border-strong),
         ),
     ),
-), 'color') !default;
-$default-theme: props.merge($default-theme, $default-theme-override);
+), $default-theme-override) !default;
+$default-theme: props.def(--o-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),
 
-$static-themes: props.def(--o-button, (), 'color');
+    --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-button, $default-theme-dark, 'dark');
 
 @each $theme in map.keys(props.get(core.$transparent-colors)) {
     $button-theme: --static-#{string.slice($theme, 3)};
 
-    $static-themes: props.merge($static-themes, (
+    $themes: props.merge($themes, (
         $button-theme: (
-            --bg:             props.get(core.$transparent-colors, $theme, --200),
-            --label:          props.get(core.$transparent-colors, $theme, --900),
-            --outline-border: props.get(core.$transparent-colors, $theme, --300),
-            --outline-label:  props.get(core.$transparent-colors, $theme, --900),
+            --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, --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:     props.get(core.$transparent-colors, $theme, --300),
-                --label:  props.get(core.$transparent-colors, $theme, --900),
+                --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, --400),
             ),
 
             --active: (
-                --bg:     props.get(core.$transparent-colors, $theme, --400),
-                --label:  props.get(core.$transparent-colors, $theme, --900),
+                --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, --500),
             ),
 
             --disabled: (
-                --bg:             props.get(core.$transparent-colors, $theme, --200),
-                --outline-border: props.get(core.$transparent-colors, $theme, --300),
-                --label:          props.get(core.$transparent-colors, $theme, --500),
+                --bg-color:     props.get(core.$transparent-colors, $theme, --100),
+                --label-color:  props.get(core.$transparent-colors, $theme, --500),
+                --border-color: props.get(core.$transparent-colors, $theme, --300),
             ),
 
             --key-focus: (
-                --bg:      props.get(core.$transparent-colors, $theme, --100),
-                --label:   props.get(core.$transparent-colors, $theme, --900),
-                --border:  props.get(core.$transparent-colors, $theme, --900),
-                --outline: props.get(core.$transparent-colors, $theme, --300),
+                --border-color:  props.get(core.$transparent-colors, $theme, --900),
+                --outline-color: props.get(core.$transparent-colors, $theme, --300),
             ),
 
-            --primary: (
-                --bg:             props.get(core.$transparent-colors, $theme, --800),
-                --label:          props.get(core.$transparent-colors, $theme, --text),
-                --outline-border: props.get(core.$transparent-colors, $theme, --800),
-                --outline-label:  props.get(core.$transparent-colors, $theme, --900),
-    
+            --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) props.get(core.$transparent-colors, $theme, --100) props.get(core.$transparent-colors, $theme, --200),
+
                 --hover: (
-                    --bg:     props.get(core.$transparent-colors, $theme, --900),
-                    --label:  props.get(core.$transparent-colors, $theme, --text),
+                    --bg-color:     props.get(core.$transparent-colors, $theme, --900),
+                    --label-color:  props.get(core.$transparent-colors, $theme, --text),
+                    --border-color: props.get(core.$transparent-colors, $theme, --100),
                 ),
 
                 --active: (
-                    --bg:     props.get(core.$transparent-colors, $theme, --900),
-                    --label:  props.get(core.$transparent-colors, $theme, --text),
+                    --bg-color:     props.get(core.$transparent-colors, $theme, --900),
+                    --label-color:  props.get(core.$transparent-colors, $theme, --text),
+                    --border-color: props.get(core.$transparent-colors, $theme, --100),
+                ),
+
+                --disabled: (
+                    --bg-color:     props.get(core.$transparent-colors, $theme, --200),
+                    --label-color:  props.get(core.$transparent-colors, $theme, --500),
+                    --border-color: props.get(core.$transparent-colors, $theme, --100),
+                ),
+            ),
+
+            --static: (
+                --bg-color:     props.get(core.$transparent-colors, $theme, --200),
+                --label-color:  props.get(core.$transparent-colors, $theme, --900),
+                --border-color: transparent,
+        
+                --hover: (
+                    --bg-color:     props.get(core.$transparent-colors, $theme, --300),
+                    --label-color:  props.get(core.$transparent-colors, $theme, --900),
+                    --border-color: transparent,
                 ),
-            )
+        
+                --active: (
+                    --bg-color:     props.get(core.$transparent-colors, $theme, --400),
+                    --label-color:  props.get(core.$transparent-colors, $theme, --900),
+                    --border-color: transparent,
+                ),
+            ),
+
+            --quiet: (
+                --label-color:  props.get(core.$transparent-colors, $theme, --900),
+        
+                --hover: (
+                    --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, --300),
+                    --label-color: props.get(core.$transparent-colors, $theme, --900),
+                ),
+        
+                --disabled: (
+                    --label-color: props.get(core.$transparent-colors, $theme, --500),
+                ),
+            ),
         )
     ));
 }
 
 $themes-config: (
     accent:   --accent,
+    positive: --positive,
     negative: --negative,
+    warning:  --warning,
 ) !default;
 
-$themes: props.def(--o-button, (), 'color');
-
 @each $theme, $key in $themes-config {
     $themes: props.merge($themes, (
         --#{$theme}: (
-            --bg:             props.get(core.$theme, #{$key}-static, --900),
-            --label:          props.get(core.$theme, #{$key}-static, --900-text),
-            --outline-border: props.get(core.$theme, $key, --900),
-            --outline-label:  props.get(core.$theme, $key, --1000),
+            --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:     props.get(core.$theme, #{$key}-static, --1000),
-                --label:  props.get(core.$theme, #{$key}-static, --1000-text),
+                --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:     props.get(core.$theme, #{$key}-static, --1100),
-                --label:  props.get(core.$theme, #{$key}-static, --1100-text),
+                --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),
+                ),
+            ),
+
+            --static: (
+                --bg-color:     props.get(core.$theme, $key, --100),
+                --label-color:  props.get(core.$theme, $key, --1100),
+                --border-color: props.get(core.$theme, $key, --300),
+        
+                --hover: (
+                    --bg-color:     props.get(core.$theme, $key, --200),
+                    --label-color:  props.get(core.$theme, $key, --1200),
+                    --border-color: props.get(core.$theme, $key, --400),
+                ),
+        
+                --active: (
+                    --bg-color:     props.get(core.$theme, $key, --300),
+                    --label-color:  props.get(core.$theme, $key, --1300),
+                    --border-color: props.get(core.$theme, $key, --500),
+                ),
+            ),
+
+            --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.2.3-70-g09d2