5 files changed, 111 insertions, 72 deletions

diff --git a/src/objects/_action-button.scss b/src/objects/_action-button.scss
index 7863f50..f4a9a46 100644
--- a/src/objects/_action-button.scss
+++ b/src/objects/_action-button.scss
@@ -52,6 +52,35 @@
         }
     }
 
+    @include bem.modifier('static') {
+        color:            props.get($theme, list.join($key, --quiet --hover --label-color)...);
+        background-color: props.get($theme, list.join($key, --quiet --hover --bg-color)...);
+        border-color:     transparent;
+        box-shadow:       none;
+
+        &:link,
+        &:visited,
+        &:enabled {
+            color:            props.get($theme, list.join($key, --quiet --hover --label-color)...);
+            background-color: props.get($theme, list.join($key, --quiet --hover --bg-color)...);
+            border-color:     transparent;
+            box-shadow:       none;
+
+            &:hover,
+            &:focus-visible {
+                color:            props.get($theme, list.join($key, --quiet --active --label-color)...);
+                background-color: props.get($theme, list.join($key, --quiet --active --bg-color)...);
+                border-color:     transparent;
+            }
+
+            &:active {
+                color:            props.get($theme, list.join($key, --quiet --active --label-color)...);
+                background-color: props.get($theme, list.join($key, --quiet --active --bg-color)...);
+                border-color:     transparent;
+            }
+        }
+    }
+
     @include bem.modifier('quiet') {
         color:            props.get($theme, list.join($key, --quiet --disabled --label-color)...);
         background-color: transparent;
@@ -80,11 +109,17 @@
         }
     }
 
-    @include bem.is('selected', 'badge') {
+    @include bem.is('selected') {
         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)...);
 
+        @include bem.modifier('static') {
+            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)...);
+        }
+
         &:link,
         &:visited,
         &:enabled {
@@ -106,12 +141,6 @@
             }
         }
     }
-
-    @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 1a9be25..84bb415 100644
--- a/src/objects/_action-button.vars.scss
+++ b/src/objects/_action-button.vars.scss
@@ -5,28 +5,28 @@
 
 $line-height:  props.def(--o-action-button--line-height, 1.4) !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;
+$rounding:     props.def(--o-action-button--rounding, props.get(core.$rounding--sm)) !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--100)) !default;
+$pad-i-pill--sm:  props.def(--o-action-button--sm--pad-i-pill, props.get(core.$size--115)) !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:        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:        props.def(--o-action-button--pad-i, props.get(core.$size--115)) !default;
+$pad-i-label:  props.def(--o-action-button--pad-i-label, props.get(core.$size--40)) !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--lg:       props.def(--o-action-button--lg--pad-i, props.get(core.$size--160)) !default;
+$pad-i-label--lg: props.def(--o-action-button--lg--pad-i-label, props.get(core.$size--65)) !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--175)) !default;
-$pad-i-label--xl: props.def(--o-action-button--xl--pad-i-label, props.get(core.$size--100)) !default;
+$pad-i--xl:       props.def(--o-action-button--xl--pad-i, props.get(core.$size--200)) !default;
+$pad-i-label--xl: props.def(--o-action-button--xl--pad-i-label, props.get(core.$size--85)) !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;
diff --git a/src/objects/_card.scss b/src/objects/_card.scss
index 4f8c7fb..6b80e2f 100644
--- a/src/objects/_card.scss
+++ b/src/objects/_card.scss
@@ -14,34 +14,26 @@
         position:         relative;
         display:          flex;
         flex-direction:   column;
-        background-color: props.get(vars.$bg-color);
         background-clip:  content-box;
-        border:           1px solid transparent;
+        background-color: props.get(vars.$bg-color);
+        border:           props.get(vars.$border-width) solid transparent;
         border-color:     props.get(vars.$border-color);
         border-radius:    props.get(vars.$rounding);
-        transition:       transform .2s;
+        transition:       transform .2s, background-color .2s, border-color .2s;
 
         @include bem.multi('&:link, &:visited, &:enabled', 'modifier' 'interactive') {
             &:hover,
             &:active,
             &:focus-visible {
-                transform: translateY(props.get(vars.$hover--offset-b));
-
-                @include bem.elem('body') {
-                    @include bem.modifier('hidden') {
-                        visibility: visible;
-                        opacity:    1;
-                        transition:
-                            opacity .2s ease,
-                            visibility .2s linear;
-                    }
-                }
+                transform:        translateY(props.get(vars.$hover--offset-b));
+                background-color: props.get(vars.$hover--bg-color);
+                border-color:     props.get(vars.$hover--border-color);
             }
 
             &:focus-visible {
-                margin:        calc(-1 * props.get(vars.$key-focus--border-width) + 1px);
-                border:        props.get(vars.$key-focus--border-offset) solid transparent;
-                border-radius: calc(props.get(vars.$rounding) + props.get(vars.$key-focus--border-offset) - 1px);
+                margin:        calc(-1 * props.get(vars.$key-focus--border-width));
+                border:        calc(props.get(vars.$key-focus--border-offset) + props.get(vars.$border-width)) 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 0
@@ -65,13 +57,13 @@
             transition:  background-color .2s, transform .2s, opacity .2s;
 
             &:first-child {
-                border-start-start-radius: calc(props.get(vars.$rounding) - 1px);
-                border-start-end-radius:   calc(props.get(vars.$rounding) - 1px);
+                border-start-start-radius: calc(props.get(vars.$rounding) - props.get(vars.$border-width));
+                border-start-end-radius:   calc(props.get(vars.$rounding) - props.get(vars.$border-width));
             }
 
             &:last-child {
-                border-end-start-radius: calc(props.get(vars.$rounding) - 1px);
-                border-end-end-radius:   calc(props.get(vars.$rounding) - 1px);
+                border-end-start-radius: calc(props.get(vars.$rounding) - props.get(vars.$border-width));
+                border-end-end-radius:   calc(props.get(vars.$rounding) - props.get(vars.$border-width));
             }
 
             @include bem.next-elem('avatar') {
@@ -104,26 +96,6 @@
                 margin-block:  -100em 100em;
                 content:       '';
             }
-
-            @include bem.modifier('hidden') {
-                position:                absolute;
-                inset-block-end:         0;
-                inset-inline:            0;
-                z-index:                 10;
-                visibility:              hidden;
-                background-color:        props.get(vars.$bg-color);
-                //border-end-start-radius: props.get(vars.$rounding);
-                //border-end-end-radius:   props.get(vars.$rounding);
-                opacity:                 0;
-                transition:
-                    opacity .2s ease,
-                    visibility 0s .2s linear;
-
-                @include bem.next-elem('image') {
-                    border-start-start-radius: calc(props.get(vars.$rounding) - 1px);
-                    border-start-end-radius:   calc(props.get(vars.$rounding) - 1px);
-                }
-            }
         }
 
         @include bem.elem('content') {
@@ -155,19 +127,14 @@
                 &:hover,
                 &:active,
                 &:focus-visible {
-                    transform: none;
+                    transform:        none;
+                    background-color: transparent;
 
                     @include bem.elem('image') {
                         background-color: props.get(vars.$quiet--hover--image-color);
                         opacity:          .75;
                         transform:        translateY(props.get(vars.$hover--offset-b));
                     }
-
-                    @include bem.elem('body') {
-                        @include bem.modifier('hidden') {
-                            transform: translateY(props.get(vars.$hover--offset-b));
-                        }
-                    }
                 }
 
                 &:focus-visible {
@@ -203,11 +170,6 @@
             @include bem.elem('body') {
                 padding:             0;
                 padding-block-start: props.get(vars.$spacing);
-
-                @include bem.modifier('hidden') {
-                    padding-block:  props.get(vars.$pad-b);
-                    padding-inline: props.get(vars.$pad-i);
-                }
             }
 
             @include bem.elem('footer') {
@@ -215,6 +177,49 @@
             }
         }
 
+        @include bem.modifier('thumbnail') {
+            @include bem.elem('image') {
+                inline-size:   calc(100% + 2 * props.get(vars.$border-width));
+                margin:        calc(-1 * props.get(vars.$border-width));
+                border-radius: props.get(vars.$rounding);
+            }
+
+            @include bem.elem('body') {
+                position:                absolute;
+                inset-block-end:         calc(-1 * props.get(vars.$border-width));
+                inset-inline:            calc(-1 * props.get(vars.$border-width));
+                z-index:                 10;
+                visibility:              hidden;
+                background-color:        props.get(vars.$hover--bg-color);
+                border-width:            0 props.get(vars.$border-width) props.get(vars.$border-width);
+                border-color:            transparent;
+                border-style:            solid;
+                border-end-start-radius: calc(props.get(vars.$rounding) - props.get(vars.$border-width));
+                border-end-end-radius:   calc(props.get(vars.$rounding) - props.get(vars.$border-width));
+                opacity:                 0;
+                transition:
+                    border-color .2s ease,
+                    opacity .2s ease,
+                    visibility 0s .2s linear;
+            }
+
+            @include bem.multi('&:link, &:visited, &:enabled', 'modifier' 'interactive') {
+                &:hover,
+                &:active,
+                &:focus-visible {
+                    @include bem.elem('body') {
+                        border-color: props.get(vars.$hover--border-color);
+                        visibility:   visible;
+                        opacity:      1;
+                        transition:
+                            border-color .2s ease,
+                            opacity .2s ease,
+                            visibility .2s linear;
+                    }
+                }
+            }
+        }
+
         @include bem.modifier('horizontal') {
             flex-direction: row;
             align-items:    center;
@@ -225,11 +230,11 @@
 
                 &:first-child {
                     border-start-end-radius:   0;
-                    border-end-start-radius:   calc(props.get(vars.$rounding) - 1px);
+                    border-end-start-radius:   props.get(vars.$rounding);
                 }
     
                 &:last-child {
-                    border-start-end-radius: calc(props.get(vars.$rounding) - 1px);
+                    border-start-end-radius: props.get(vars.$rounding);
                     border-end-start-radius: 0;
                 }
             }
diff --git a/src/objects/_card.vars.scss b/src/objects/_card.vars.scss
index 4f5cf40..c5bbc0d 100644
--- a/src/objects/_card.vars.scss
+++ b/src/objects/_card.vars.scss
@@ -3,6 +3,8 @@
 @use '../core.vars' as core;
 
 $divider-width:        props.def(--o-card--divider-width, props.get(core.$border-width--thin)) !default;
+$border-width:         props.def(--o-card--border-width, props.get(core.$border-width--thin)) !default;
+$sub-border-width:     props.def(--o-card--sub-border-width, props.get(core.$border-width--thick)) !default;
 $pad-i:                props.def(--o-card--pad-i, props.get(core.$size--300)) !default;
 $pad-b:                props.def(--o-card--pad-b, props.get(core.$size--250)) !default;
 $spacing:              props.def(--o-card--spacing, props.get(core.$size--200)) !default;
@@ -17,9 +19,12 @@ $key-focus--border-offset: props.def(--o-card--key-focus--border-offset, props.g
 $key-focus--outline-width: props.def(--o-card--key-focus--outline-width, props.get(core.$key-focus--outline-width)) !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), 'color') !default;
+$border-color:  props.def(--o-card--border-color, props.get(core.$theme, --box, --border), 'color') !default;
 $divider-color: props.def(--o-card--divider-color, props.get(core.$theme, --border-mute), 'color') !default;
 
+$hover--bg-color:         props.def(--o-card--hover--bg-color, color-mix(in lch, props.get($bg-color), props.get(core.$theme, --border-mute)), 'color') !default;
+$hover--border-color:     props.def(--o-card--hover--border-color, props.get(core.$theme, --border), 'color') !default;
+
 $key-focus--label-color:   props.def(--o-card--key-focus--label-color, props.get(core.$theme, --focus, --text), 'color') !default;
 $key-focus--border-color:  props.def(--o-card--key-focus--border-color, props.get(core.$theme, --focus, --border), 'color') !default;
 $key-focus--outline-color: props.def(--o-card--key-focus--outline-color, props.get(core.$theme, --focus, --outline), 'color') !default;
diff --git a/src/objects/_text-field.vars.scss b/src/objects/_text-field.vars.scss
index 833eacb..f64c42b 100644
--- a/src/objects/_text-field.vars.scss
+++ b/src/objects/_text-field.vars.scss
@@ -6,7 +6,7 @@ $line-height:  props.def(--o-text-field--line-height, 1.4) !default;
 $pad-i:        props.def(--o-text-field--pad-i, props.get(core.$size--125)) !default;
 $pad-b:        props.def(--o-text-field--pad-b, props.get(core.$size--125)) !default;
 $border-width: props.def(--o-text-field--border-width, props.get(core.$border-width--thin)) !default;
-$rounding:     props.def(--o-text-field--rounding, props.get(core.$rounding)) !default;
+$rounding:     props.def(--o-text-field--rounding, props.get(core.$rounding--sm)) !default;
 
 $extended--pad: props.def(--o-text-field--extended--pad, props.get(core.$size--50)) !default;