Various fixes

2 files changed, 11 insertions, 7 deletions

diff --git a/src/layouts/_card-list.scss b/src/layouts/_card-list.scss
index b828e44..abb0277 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,14 +16,14 @@
         gap:            props.get(vars.$row-gap);
 
         @include bem.modifier('merge') {
-            position:   relative;
-            gap:        0;
+            position:         relative;
+            gap:              props.get(vars.$border-width);
+            background-color: props.get(vars.$border-color);
+            border:           props.get(vars.$border-width) solid props.get(vars.$border-color);
+            border-radius:    props.get(vars.$rounding);
 
             @include bem.elem('card') {
-                transition: none;
-
                 &:not(:last-child) {
-                    margin-bottom:           calc(-1 * props.get(card.$border-width));
                     border-end-start-radius: 0;
                     border-end-end-radius:   0;
                 }
diff --git a/src/layouts/_card-list.vars.scss b/src/layouts/_card-list.vars.scss
index 1c49c0f..0c8d702 100644
--- a/src/layouts/_card-list.vars.scss
+++ b/src/layouts/_card-list.vars.scss
@@ -1,5 +1,9 @@
 @use 'iro-sass/src/props';
 @use '../core.vars' as core;
+@use '../objects/card' as card;
+
+$border-width:   props.def(--l-card-list--border-width, props.get(card.$border-width)) !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--100)) !default;
 $quiet--row-gap: props.def(--l-card-list--quiet--row-gap, props.get(core.$size--800)) !default;
@@ -24,4 +28,5 @@ $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;
+$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;