3 files changed, 65 insertions, 20 deletions

diff --git a/src/layouts/_button-group.scss b/src/layouts/_button-group.scss
index b0a3c8e..6c874e1 100644
--- a/src/layouts/_button-group.scss
+++ b/src/layouts/_button-group.scss
@@ -5,7 +5,7 @@
 
 @forward 'button-group.vars';
 @use 'button-group.vars' as vars;
-@use '../objects/action-button.vars' as action-button;
+@use '../objects/button.vars' as button;
 
 @mixin styles {
     @include materialize-at-root(meta.module-variables('vars'));
@@ -22,26 +22,26 @@
         }
 
         @include bem.modifier('align-block') {
-            margin-inline: calc(-1 * props.get(action-button.$pad-i) - props.get(action-button.$border-width));
+            margin-inline: calc(-1 * props.get(button.$pad-i) - props.get(button.$border-width));
 
             @include bem.modifier('pill') {
-                margin-inline: calc(-1 * props.get(action-button.$pad-i-pill) - props.get(action-button.$border-width));
+                margin-inline: calc(-1 * props.get(button.$pad-i-pill) - props.get(button.$border-width));
             }
 
             @include bem.modifier('icon') {
-                margin-inline: calc(-1 * props.get(action-button.$pad-b) - props.get(action-button.$border-width) - .5em * (props.get(action-button.$line-height) - 1));
+                margin-inline: calc(-1 * props.get(button.$pad-b) - props.get(button.$border-width) - .5em * (props.get(button.$line-height) - 1));
             }
 
-            @each $mod, $pad-i, $pad-i-label, $pad-i-pill, $pad-b, $font-size in action-button.$fixed-sizes {
+            @each $mod, $pad-i, $pad-i-label, $pad-i-pill, $pad-b, $font-size in button.$fixed-sizes {
                 @include bem.modifier('action-#{$mod}') {
-                    margin-inline: calc(-1 * props.get($pad-i) - props.get(action-button.$border-width));
+                    margin-inline: calc(-1 * props.get($pad-i) - props.get(button.$border-width));
     
                     @include bem.modifier('pill') {
-                        margin-inline: calc(-1 * props.get($pad-i-pill) - props.get(action-button.$border-width));
+                        margin-inline: calc(-1 * props.get($pad-i-pill) - props.get(button.$border-width));
                     }
 
                     @include bem.modifier('icon') {
-                        margin-inline: calc(-1 * props.get($pad-b) - props.get(action-button.$border-width) - .5em * (props.get(action-button.$line-height) - 1));
+                        margin-inline: calc(-1 * props.get($pad-b) - props.get(button.$border-width) - .5em * (props.get(button.$line-height) - 1));
                     }
                 }
             }
diff --git a/src/layouts/_card-list.scss b/src/layouts/_card-list.scss
index c8c3d18..cca6e72 100644
--- a/src/layouts/_card-list.scss
+++ b/src/layouts/_card-list.scss
@@ -6,7 +6,6 @@
 
 @forward 'card-list.vars';
 @use 'card-list.vars' as vars;
-@use '../objects/card.vars' as card;
 
 @mixin styles {
     @include materialize-at-root(meta.module-variables('vars'));
@@ -17,22 +16,33 @@
         gap:            props.get(vars.$row-gap);
 
         @include bem.modifier('merge') {
-            position:   relative;
-            gap:        0;
+            position:         relative;
+            gap:              calc(2 * props.get(vars.$merge-padding) + props.get(vars.$border-width));
+            padding:          props.get(vars.$merge-padding);
+            background-color: props.get(vars.$card-bg-color);
+            border:           props.get(vars.$border-width) solid props.get(vars.$border-color);
+            border-radius:    calc(props.get(vars.$rounding) + props.get(vars.$merge-padding));
 
             @include bem.elem('card') {
-                transition: none;
-
                 &:not(:last-child) {
-                    margin-bottom:           calc(-1 * props.get(card.$border-width));
+                    position:                relative;
                     border-end-start-radius: 0;
                     border-end-end-radius:   0;
+
+                    &::after {
+                        position:          absolute;
+                        inset-block-start: calc(100% + props.get(vars.$merge-padding) + props.get(vars.$border-width));
+                        inset-inline:      calc(-1 * props.get(vars.$merge-padding) - props.get(vars.$border-width));
+                        content:           '';
+                        display:           block;
+                        block-size:        props.get(vars.$border-width);
+                        background-color:  props.get(vars.$border-color);
+                    }
                 }
 
                 &:hover,
                 &:active,
                 &:focus-visible {
-                    z-index:    10;
                     transform:  none;
                 }
 
@@ -41,6 +51,27 @@
                     border-start-end-radius:   0;
                 }
             }
+
+            @include bem.modifier('borderless') {
+                border-color: props.get(vars.$card-bg-color);
+
+                @include bem.elem('card') {
+                    &:not(:last-child) {
+                        &::after {
+                            inset-inline: calc(-1 * props.get(vars.$merge-padding) - 2 * props.get(vars.$border-width));
+                        }
+                    }
+                }
+            }
+
+            @include bem.modifier('shadow') {
+                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('quiet') {
@@ -63,7 +94,7 @@
             gap:                   props.get(vars.$grid-sm--row-gap) props.get(vars.$grid-sm--col-gap);
 
             @include bem.modifier("grid-sm") {
-                @include iro.media--media("<=md") {
+                @include media.media("<=md") {
                     display: flex;
                     gap:     props.get(vars.$row-gap);
                 }
diff --git a/src/layouts/_card-list.vars.scss b/src/layouts/_card-list.vars.scss
index 1c49c0f..75e72cc 100644
--- a/src/layouts/_card-list.vars.scss
+++ b/src/layouts/_card-list.vars.scss
@@ -1,7 +1,12 @@
 @use 'iro-sass/src/props';
 @use '../core.vars' as core;
+@use '../objects/card' as card;
 
-$row-gap:        props.def(--l-card-list--row-gap, props.get(core.$size--100)) !default;
+$border-width:   props.def(--l-card-list--border-width, props.get(card.$border-width)) !default;
+$merge-padding:  props.def(--l-card-list--merge-padding, props.get(core.$border-width--thick)) !default;
+$rounding:       props.def(--l-card-list--rounding, props.get(card.$rounding)) !default;
+
+$row-gap:        props.def(--l-card-list--row-gap, props.get(core.$size--200)) !default;
 $quiet--row-gap: props.def(--l-card-list--quiet--row-gap, props.get(core.$size--800)) !default;
 
 $grid--row-gap:        props.def(--l-card-list--grid--row-gap, props.get(core.$size--400)) !default;
@@ -9,8 +14,8 @@ $grid--col-gap:        props.def(--l-card-list--grid--col-gap, props.get(core.$s
 $grid--col-width:      props.def(--l-card-list--grid--col-width, props.get(core.$size--3200)) !default;
 $grid--quiet--row-gap: props.def(--l-card-list--grid--quiet--row-gap, props.get(core.$size--800)) !default;
 
-$grid-sm--row-gap:        props.def(--l-card-list--grid-md--row-gap, props.get(core.$size--150)) !default;
-$grid-sm--col-gap:        props.def(--l-card-list--grid-md--col-gap, props.get(core.$size--150)) !default;
+$grid-sm--row-gap:        props.def(--l-card-list--grid-md--row-gap, props.get(core.$size--200)) !default;
+$grid-sm--col-gap:        props.def(--l-card-list--grid-md--col-gap, props.get(core.$size--200)) !default;
 $grid-sm--col-width:      props.def(--l-card-list--grid-md--col-width, props.get(core.$size--4600)) !default;
 $grid-sm--quiet--row-gap: props.def(--l-card-list--grid-sm--quiet--row-gap, props.get(core.$size--800)) !default;
 
@@ -24,4 +29,13 @@ $masonry-h--col-gap:        props.def(--l-card-list--masonry-h--col-gap, props.g
 $masonry-h--row-height:     props.def(--l-card-list--masonry-h--row-height, props.get(core.$size--3200)) !default;
 $masonry-h--quiet--row-gap: props.def(--l-card-list--masonry-h--quiet--row-gap, props.get(core.$size--800)) !default;
 
-$border-color: props.def(--l-card-list--border-color, props.get(core.$theme, --border), 'color') !default;
+$shadow-x:    props.def(--l-card-list--shadow-x, props.get(card.$shadow-x)) !default;
+$shadow-y:    props.def(--l-card-list--shadow-y, props.get(card.$shadow-y)) !default;
+$shadow-blur: props.def(--l-card-list--shadow-blur, props.get(card.$shadow-blur)) !default;
+$shadow-grow: props.def(--l-card-list--shadow-grow, props.get(card.$shadow-grow)) !default;
+
+$card-bg-color:      props.def(--l-card-list--bg-color, props.get(card.$bg-color), 'color') !default;
+$border-color:       props.def(--l-card-list--border-color, props.get(card.$border-color), 'color') !default;
+$shadow-color:       props.def(--l-card-list--shadow-color, props.get(card.$shadow-color), 'color') !default;
+
+$border-color-dark:  props.def(--l-card-list--border-color, props.get(core.$theme, --bg-l1), 'dark') !default;