From 31b6142ec30d8d4c917ebcf7c3b985d0a2dd27d4 Mon Sep 17 00:00:00 2001
From: Volpeon <git@volpeon.ink>
Date: Tue, 3 Mar 2026 17:02:52 +0100
Subject: Fix card list merge layout

---
 src/layouts/_card-list.scss      | 23 +++++++++++++++++------
 src/layouts/_card-list.vars.scss |  5 +----
 2 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/layouts/_card-list.scss b/src/layouts/_card-list.scss
index 8bec6f8..ef99a92 100644
--- a/src/layouts/_card-list.scss
+++ b/src/layouts/_card-list.scss
@@ -18,11 +18,14 @@
 		gap:            props.get(vars.$row-gap);
 
 		@include bem.modifier('merge') {
-			position: relative;
-			gap:      0;
+			position:      relative;
+			gap:           0;
+			border-radius: props.get(vars.$rounding);
 
 			@include bem.elem('card') {
+				border-color:    props.get(card.$border-color) props.get(card.$border-color) props.get(vars.$border-color);
 				background-clip: content-box;
+				box-shadow:      none;
 
 				&:not(:last-child) {
 					position:                relative;
@@ -53,6 +56,15 @@
 					}
 				}
 
+				&:last-child {
+					border-block-end-color: props.get(card.$border-color);
+				}
+
+				&:hover,
+				&:active {
+					border-color: props.get(card.$hover--border-color);
+				}
+
 				&:focus-visible {
 					border-color: props.get(card.$hover--bg-color);
 				}
@@ -60,15 +72,14 @@
 
 			@include bem.modifier('borderless') {
 				@include bem.elem('card') {
-					border-inline-color: props.get(vars.$card-bg-color);
-					border-block-color:  props.get(vars.$card-bg-color) props.get(card.$border-color);
+					border-color: props.get(card.$bg-color) props.get(card.$bg-color) props.get(vars.$border-color);
 
 					@include bem.next-twin-elem {
 						border-block-start-color: transparent;
 					}
 
 					&:last-child {
-						border-block-end-color: props.get(vars.$card-bg-color);
+						border-block-end-color: props.get(card.$bg-color);
 					}
 
 					&:hover,
@@ -88,7 +99,7 @@
 					props.get(vars.$shadow-y)
 					props.get(vars.$shadow-blur)
 					props.get(vars.$shadow-grow)
-					props.get(vars.$shadow-color);
+					props.get(card.$shadow-color);
 			}
 		}
 
diff --git a/src/layouts/_card-list.vars.scss b/src/layouts/_card-list.vars.scss
index e5fa731..b33776c 100644
--- a/src/layouts/_card-list.vars.scss
+++ b/src/layouts/_card-list.vars.scss
@@ -45,8 +45,5 @@ $shadow-y:    props.def(--l-card-list--shadow-y, props.get(card.$shadow-y)) !def
 $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;
+$border-color-dark:  props.def(--l-card-list--border-color, props.get(core.$theme, --border-mute), 'dark') !default;
-- 
cgit v1.2.3-70-g09d2