From 943ee062fe2c0344165e28f4d612176878159133 Mon Sep 17 00:00:00 2001
From: Volpeon <git@volpeon.ink>
Date: Mon, 21 Jul 2025 16:03:52 +0200
Subject: Consolidating button, action-button and badge; change design to have
 some 3D components

---
 src/_config.defaults.scss            |   4 +-
 src/_core.vars.scss                  |  14 ++-
 src/objects/_action-button.scss      |  16 +++-
 src/objects/_action-button.vars.scss | 176 ++++++++++++++++++++++++++++-------
 src/objects/_alert.scss              |  16 +++-
 src/objects/_alert.vars.scss         |  13 ++-
 src/objects/_card.scss               |  47 +++++++---
 src/objects/_card.vars.scss          |   9 ++
 src/objects/_popover.scss            |  10 +-
 src/objects/_popover.vars.scss       |  12 ++-
 10 files changed, 256 insertions(+), 61 deletions(-)

(limited to 'src')

diff --git a/src/_config.defaults.scss b/src/_config.defaults.scss
index cf23f29..ac20cb9 100644
--- a/src/_config.defaults.scss
+++ b/src/_config.defaults.scss
@@ -127,7 +127,7 @@ $theme-light: (
     )),
 
     --constants: (
-        --shadow: rgba(#000, .15),
+        --shadow: rgba(#000, .1),
     ),
 );
 
@@ -182,6 +182,6 @@ $theme-dark: (
     )),
 
     --constants: (
-        --shadow: rgba(#000, .5),
+        --shadow: rgba(#000, .1),
     ),
 );
diff --git a/src/_core.vars.scss b/src/_core.vars.scss
index 0a94534..04c0f63 100644
--- a/src/_core.vars.scss
+++ b/src/_core.vars.scss
@@ -89,11 +89,17 @@ $border-width--thick:  props.def(--border-width--thick, 4px) !default;
 $border-width--medium: props.def(--border-width--medium, 2px) !default;
 $border-width--thin:   props.def(--border-width--thin, 1px) !default;
 
-$shadow--x:    props.def(--shadow--x, 0) !default;
-$shadow--y:    props.def(--shadow--y, 1px) !default;
-$shadow--blur: props.def(--shadow--blur, 4px) !default;
+$shadow--l1--x:    props.def(--shadow--l1--x, 0) !default;
+$shadow--l1--y:    props.def(--shadow--l1--y, 2px) !default;
+$shadow--l1--blur: props.def(--shadow--l1--blur, 3px) !default;
+$shadow--l1--grow: props.def(--shadow--l1--grow, -1px) !default;
 
-$rounding: props.def(--rounding, 4px) !default;
+$shadow--l2--x:    props.def(--shadow--l2--x, 0) !default;
+$shadow--l2--y:    props.def(--shadow--l2--y, 4px) !default;
+$shadow--l2--blur: props.def(--shadow--l2--blur, 8px) !default;
+$shadow--l2--grow: props.def(--shadow--l2--grow, -3px) !default;
+
+$rounding: props.def(--rounding, 8px) !default;
 
 $key-focus--outline-width: props.def(--key-focus--outline-width, props.get($border-width--thick)) !default;
 $key-focus--border-width:  props.def(--key-focus--border-width, props.get($border-width--medium)) !default;
diff --git a/src/objects/_action-button.scss b/src/objects/_action-button.scss
index 1dd4b84..7863f50 100644
--- a/src/objects/_action-button.scss
+++ b/src/objects/_action-button.scss
@@ -30,6 +30,12 @@
         color:            props.get($theme, list.join($key, --label-color)...);
         background-color: props.get($theme, list.join($key, --bg-color)...);
         border-color:     props.get($theme, list.join($key, --border-color)...);
+        box-shadow:
+            props.get(vars.$shadow-x)
+            props.get(vars.$shadow-y)
+            props.get(vars.$shadow-blur)
+            props.get(vars.$shadow-grow)
+            props.get($theme, list.join($key, --shadow-color)...);
 
         &:hover,
         &:focus-visible {
@@ -42,6 +48,7 @@
             color:            props.get($theme, list.join($key, --active --label-color)...);
             background-color: props.get($theme, list.join($key, --active --bg-color)...);
             border-color:     props.get($theme, list.join($key, --active --border-color)...);
+            box-shadow:       none;
         }
     }
 
@@ -56,6 +63,7 @@
             color:            props.get($theme, list.join($key, --quiet --label-color)...);
             background-color: transparent;
             border-color:     transparent;
+            box-shadow:       none;
 
             &:hover,
             &:focus-visible {
@@ -72,7 +80,7 @@
         }
     }
 
-    @include bem.is('selected') {
+    @include bem.is('selected', 'badge') {
         color:            props.get($theme, list.join($key, --selected --disabled --label-color)...);
         background-color: props.get($theme, list.join($key, --selected --disabled --bg-color)...);
         border-color:     props.get($theme, list.join($key, --selected --disabled --border-color)...);
@@ -98,6 +106,12 @@
             }
         }
     }
+
+    @include bem.is('badge') {
+        color:            props.get($theme, list.join($key, --selected --label-color)...);
+        background-color: props.get($theme, list.join($key, --selected --bg-color)...);
+        border-color:     props.get($theme, list.join($key, --selected --border-color)...);
+    }
 }
 
 @mixin styles {
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),
+                ),
+            ),
+        )
+    ));
+}
diff --git a/src/objects/_alert.scss b/src/objects/_alert.scss
index 825f7ce..de0e913 100644
--- a/src/objects/_alert.scss
+++ b/src/objects/_alert.scss
@@ -14,12 +14,26 @@
         padding-block:    props.get(vars.$pad-b);
         padding-inline:   props.get(vars.$pad-i);
         background-color: props.get(vars.$bg-color);
-        border:           props.get(vars.$border-width) solid props.get(vars.$border-color);
+        border:           props.get(vars.$border-width) solid transparent;
+        border-color:     props.get(vars.$border-color);
         border-radius:    props.get(vars.$rounding);
+        box-shadow:
+            props.get(vars.$shadow-x)
+            props.get(vars.$shadow-y)
+            props.get(vars.$shadow-blur)
+            props.get(vars.$shadow-grow)
+            props.get(vars.$shadow-color);
 
         @each $mod, $theme in vars.$themes-config {
             @include bem.modifier($mod) {
+                background-color: props.get(vars.$themes, $theme, --bg-color);
                 border-color: props.get(vars.$themes, $theme, --border-color);
+                box-shadow:
+                    props.get(vars.$shadow-x)
+                    props.get(vars.$shadow-y)
+                    props.get(vars.$shadow-blur)
+                    props.get(vars.$shadow-grow)
+                    props.get(vars.$themes, $theme, --shadow-color);
             }
         }
     }
diff --git a/src/objects/_alert.vars.scss b/src/objects/_alert.vars.scss
index 53c9e68..f23928d 100644
--- a/src/objects/_alert.vars.scss
+++ b/src/objects/_alert.vars.scss
@@ -6,8 +6,15 @@ $pad-i:        props.def(--o-alert--pad-i, props.get(core.$size--250)) !default;
 $pad-b:        props.def(--o-alert--pad-b, props.get(core.$size--200)) !default;
 $rounding:     props.def(--o-alert--rounding, props.get(core.$rounding)) !default;
 
+$shadow-x:    props.def(--o-alert--shadow-x, props.get(core.$shadow--l2--x)) !default;
+$shadow-y:    props.def(--o-alert--shadow-y, props.get(core.$shadow--l2--y)) !default;
+$shadow-blur: props.def(--o-alert--shadow-blur, props.get(core.$shadow--l2--blur)) !default;
+$shadow-grow: props.def(--o-alert--shadow-grow, props.get(core.$shadow--l2--grow)) !default;
+
 $bg-color:     props.def(--o-alert--bg-color, props.get(core.$theme, --bg-l2), 'color') !default;
-$border-color: props.def(--o-alert--border-color, props.get(core.$theme, --text-mute-more), 'color') !default;
+$border-color: props.def(--o-alert--border-color, props.get(core.$theme, --text-mute-more) props.get(core.$theme, --text-mute-more) props.get(core.$theme, --text-mute), 'color') !default;
+
+$shadow-color:  props.def(--o-alert--shadow-color, props.get(core.$transparent-colors, --black, --200), 'color') !default;
 
 $themes-config: (
     accent:   --accent,
@@ -21,7 +28,9 @@ $themes: props.def(--o-alert, (), 'color');
 @each $theme, $key in $themes-config {
     $themes: props.merge($themes, (
         $key: (
-            --border-color: props.get(core.$theme, $key, --700),
+            --bg-color:     props.get(core.$theme, --bg-l2),
+            --border-color: props.get(core.$theme, $key, --700) props.get(core.$theme, $key, --700) props.get(core.$theme, $key, --800),
+            --shadow-color: props.get(core.$theme, $key, --200),
         )
     ));
 }
diff --git a/src/objects/_card.scss b/src/objects/_card.scss
index c87e676..9f70420 100644
--- a/src/objects/_card.scss
+++ b/src/objects/_card.scss
@@ -14,12 +14,18 @@
         position:         relative;
         display:          flex;
         flex-direction:   column;
-        margin:           calc(-1 * props.get(vars.$key-focus--border-width));
         background-color: props.get(vars.$bg-color);
         background-clip:  content-box;
-        border:           props.get(vars.$key-focus--border-offset) solid transparent;
-        border-radius:    calc(props.get(vars.$rounding) + props.get(vars.$key-focus--border-offset));
+        border:           1px solid transparent;
+        border-color:     props.get(vars.$border-color);
+        border-radius:    props.get(vars.$rounding);
         transition:       transform .2s;
+        box-shadow:
+            props.get(vars.$shadow-x)
+            props.get(vars.$shadow-y)
+            props.get(vars.$shadow-blur)
+            props.get(vars.$shadow-grow)
+            props.get(vars.$shadow-color);
 
         @include bem.multi('&:link, &:visited, &:enabled', 'modifier' 'interactive') {
             &:hover,
@@ -39,7 +45,10 @@
             }
 
             &:focus-visible {
-                outline:      props.get(vars.$key-focus--border-color) solid props.get(vars.$key-focus--border-width);
+                margin:        calc(-1 * props.get(vars.$key-focus--border-width));
+                border:        props.get(vars.$key-focus--border-offset) solid transparent;
+                border-radius: calc(props.get(vars.$rounding) + props.get(vars.$key-focus--border-offset));
+                outline:       props.get(vars.$key-focus--border-color) solid props.get(vars.$key-focus--border-width);
                 box-shadow:
                     0
                     0
@@ -64,13 +73,13 @@
             transition:  background-color .2s, transform .2s, opacity .2s;
 
             &:first-child {
-                border-start-start-radius: props.get(vars.$rounding);
-                border-start-end-radius:   props.get(vars.$rounding);
+                border-start-start-radius: calc(props.get(vars.$rounding) - 1px);
+                border-start-end-radius:   calc(props.get(vars.$rounding) - 1px);
             }
 
             &:last-child {
-                border-end-start-radius: props.get(vars.$rounding);
-                border-end-end-radius:   props.get(vars.$rounding);
+                border-end-start-radius: calc(props.get(vars.$rounding) - 1px);
+                border-end-end-radius:   calc(props.get(vars.$rounding) - 1px);
             }
 
             @include bem.next-elem('avatar') {
@@ -119,8 +128,8 @@
                     visibility 0s .2s linear;
 
                 @include bem.next-elem('image') {
-                    border-start-start-radius: props.get(vars.$rounding);
-                    border-start-end-radius:   props.get(vars.$rounding);
+                    border-start-start-radius: calc(props.get(vars.$rounding) - 1px);
+                    border-start-end-radius:   calc(props.get(vars.$rounding) - 1px);
                 }
             }
         }
@@ -148,6 +157,7 @@
             margin-inline:    0;
             background-color: transparent;
             border:           0;
+            box-shadow:       none;
 
             @include bem.multi('&:link, &:visited, &:enabled', 'modifier' 'interactive') {
                 &:hover,
@@ -173,6 +183,9 @@
                     box-shadow: none;
 
                     @include bem.elem('image') {
+                        margin:           calc(-1 * props.get(vars.$key-focus--border-width));
+                        border:           props.get(vars.$key-focus--border-offset) solid transparent;
+                        border-radius:    calc(props.get(vars.$rounding) + props.get(vars.$key-focus--border-offset));
                         background-color: props.get(vars.$quiet--hover--image-color);
                         outline:          props.get(vars.$key-focus--border-color) solid props.get(vars.$key-focus--border-width);
                         box-shadow:
@@ -188,11 +201,15 @@
 
             @include bem.elem('image') {
                 position:         relative;
-                margin:           calc(-1 * props.get(vars.$key-focus--border-width));
                 background-color: props.get(vars.$quiet--image-color);
                 background-clip:  padding-box;
-                border:           props.get(vars.$key-focus--border-offset) solid transparent;
-                border-radius:    calc(props.get(vars.$rounding) + props.get(vars.$key-focus--border-offset));
+                border-radius:    props.get(vars.$rounding);
+                box-shadow:
+                    props.get(vars.$shadow-x)
+                    props.get(vars.$shadow-y)
+                    props.get(vars.$shadow-blur)
+                    props.get(vars.$shadow-grow)
+                    props.get(vars.$shadow-color);
             }
 
             @include bem.elem('body') {
@@ -220,11 +237,11 @@
 
                 &:first-child {
                     border-start-end-radius:   0;
-                    border-end-start-radius:   props.get(vars.$rounding);
+                    border-end-start-radius:   calc(props.get(vars.$rounding) - 1px);
                 }
     
                 &:last-child {
-                    border-start-end-radius: props.get(vars.$rounding);
+                    border-start-end-radius: calc(props.get(vars.$rounding) - 1px);
                     border-end-start-radius: 0;
                 }
             }
diff --git a/src/objects/_card.vars.scss b/src/objects/_card.vars.scss
index 8adbcde..3859b12 100644
--- a/src/objects/_card.vars.scss
+++ b/src/objects/_card.vars.scss
@@ -16,7 +16,14 @@ $key-focus--border-width:  props.def(--o-card--key-focus--border-width, props.ge
 $key-focus--border-offset: props.def(--o-card--key-focus--border-offset, props.get(core.$key-focus--border-offset)) !default;
 $key-focus--outline-width: props.def(--o-card--key-focus--outline-width, props.get(core.$key-focus--outline-width)) !default;
 
+$shadow-x:    props.def(--o-card--shadow-x, props.get(core.$shadow--l2--x)) !default;
+$shadow-y:    props.def(--o-card--shadow-y, props.get(core.$shadow--l2--y)) !default;
+$shadow-blur: props.def(--o-card--shadow-blur, props.get(core.$shadow--l2--blur)) !default;
+$shadow-grow: props.def(--o-card--shadow-grow, props.get(core.$shadow--l2--grow)) !default;
+
+$shadow-color:  props.def(--o-card--shadow-color, props.get(core.$theme, --shadow), 'color') !default;
 $bg-color:      props.def(--o-card--bg-color, props.get(core.$theme, --bg-l2), 'color') !default;
+$border-color:  props.def(--o-card--border-color, props.get(core.$theme, --border-mute) props.get(core.$theme, --border-mute) props.get(core.$theme, --border), 'color') !default;
 $divider-color: props.def(--o-card--divider-color, props.get(core.$theme, --border-mute), 'color') !default;
 
 $key-focus--label-color:   props.def(--o-card--key-focus--label-color, props.get(core.$theme, --focus, --text), 'color') !default;
@@ -25,3 +32,5 @@ $key-focus--outline-color: props.def(--o-card--key-focus--outline-color, props.g
 
 $quiet--image-color:        props.def(--o-card--quiet--image-color, props.get(core.$theme, --bg-base), 'color') !default;
 $quiet--hover--image-color: props.def(--o-card--quiet--hover--image-color, props.get(core.$theme, --border), 'color') !default;
+
+$border-color-dark:  props.def(--o-card--border-color, props.get(core.$theme, --border-mute), 'dark') !default;
diff --git a/src/objects/_popover.scss b/src/objects/_popover.scss
index 3fe6310..4356dff 100644
--- a/src/objects/_popover.scss
+++ b/src/objects/_popover.scss
@@ -19,10 +19,16 @@
         margin:             0;
         color:              currentColor;
         background-color:   props.get(vars.$bg-color);
-        filter:             props.get(vars.$filter);
-        border:             props.get(vars.$border-width) solid props.get(vars.$border-color);
+        border:             props.get(vars.$border-width) solid transparent;
+        border-color:       props.get(vars.$border-color);
         border-radius:      props.get(vars.$rounding);
         transform:          translate(var(--x), var(--y));
+        box-shadow:
+            props.get(vars.$shadow-x)
+            props.get(vars.$shadow-y)
+            props.get(vars.$shadow-blur)
+            props.get(vars.$shadow-grow)
+            props.get(vars.$shadow-color);
 
         @include bem.modifier('up-left') {
             transform: translate(var(--x), calc(var(--y) - 100%));
diff --git a/src/objects/_popover.vars.scss b/src/objects/_popover.vars.scss
index b76112e..451cc18 100644
--- a/src/objects/_popover.vars.scss
+++ b/src/objects/_popover.vars.scss
@@ -9,6 +9,14 @@ $separator-width: props.def(--o-popover--separator-width, props.get(core.$size--
 $rounding:        props.def(--o-popover--rounding, props.get(core.$rounding)) !default;
 $border-width:    props.def(--o-popover--border-width, props.get(core.$border-width--thin)) !default;
 
+$shadow-x:    props.def(--o-popover--shadow-x, props.get(core.$shadow--l2--x)) !default;
+$shadow-y:    props.def(--o-popover--shadow-y, props.get(core.$shadow--l2--y)) !default;
+$shadow-blur: props.def(--o-popover--shadow-blur, props.get(core.$shadow--l2--blur)) !default;
+$shadow-grow: props.def(--o-popover--shadow-grow, props.get(core.$shadow--l2--grow)) !default;
+
 $bg-color:     props.def(--o-popover--bg-color, props.get(core.$theme, --bg-l2), 'color') !default;
-$border-color: props.def(--o-popover--border-color, props.get(core.$theme, --border), 'color') !default;
-$filter:       props.def(--o-popover--filter, drop-shadow(props.get(core.$shadow--x) props.get(core.$shadow--y) props.get(core.$shadow--blur) props.get(core.$theme, --shadow)), 'color') !default;
+$border-color: props.def(--o-popover--border-color, props.get(core.$theme, --border-mute) props.get(core.$theme, --border-mute) props.get(core.$theme, --border), 'color') !default;
+
+$shadow-color:  props.def(--o-popover--shadow-color, props.get(core.$transparent-colors, --black, --200), 'color') !default;
+
+$border-color-dark:  props.def(--o-popover--border-color, props.get(core.$theme, --border-mute), 'dark') !default;
-- 
cgit v1.2.3-70-g09d2