fix(@clayui/css): Mixins Timelines ignore timeline variables and use …

…cadmin variables when compiling Cadmin Timelines fix(@clayui/css): Timelines use $panel-border-left-width instead of $card-border-width for calculating increment position with panel
liferay · Aug 23, 2021 · 2eebd4a · 2eebd4a
1 parent 76670ef
commit 2eebd4a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/packages/clay-css/src/scss/components/_timelines.scss b/packages/clay-css/src/scss/components/_timelines.scss
@@ -69,7 +69,7 @@
 
 	.panel {
 		.timeline-increment {
-			margin-left: -$card-border-width;
+			margin-left: math-sign($panel-border-left-width);
 		}
 	}
 }

diff --git a/packages/clay-css/src/scss/mixins/_timelines.scss b/packages/clay-css/src/scss/mixins/_timelines.scss
@@ -2,6 +2,30 @@
 /// @group timelines
 ////
 
+$card-border-width: if(
+	variable-exists(card-border-width),
+	$card-border-width,
+	$cadmin-card-border-width
+);
+
+$timeline-inner-spacing: if(
+	variable-exists(timeline-inner-spacing),
+	$timeline-inner-spacing,
+	$cadmin-timeline-inner-spacing
+);
+
+$timeline-border-width: if(
+	variable-exists(timeline-border-width),
+	$timeline-border-width,
+	$cadmin-timeline-border-width
+);
+
+$timeline-border-modifier: if(
+	variable-exists(timeline-border-modifier),
+	$timeline-border-modifier,
+	$cadmin-timeline-border-modifier
+);
+
 /// A mixin that places the `.timeline-item::before` element on the right side. This mixin is used in `.timeline-right`.
 /// @todo
 /// - Add @link to documentation