Skip to content

Commit 2eebd4a

Browse files
committed
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
1 parent 76670ef commit 2eebd4a

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

packages/clay-css/src/scss/components/_timelines.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969

7070
.panel {
7171
.timeline-increment {
72-
margin-left: -$card-border-width;
72+
margin-left: math-sign($panel-border-left-width);
7373
}
7474
}
7575
}

packages/clay-css/src/scss/mixins/_timelines.scss

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,30 @@
22
/// @group timelines
33
////
44

5+
$card-border-width: if(
6+
variable-exists(card-border-width),
7+
$card-border-width,
8+
$cadmin-card-border-width
9+
);
10+
11+
$timeline-inner-spacing: if(
12+
variable-exists(timeline-inner-spacing),
13+
$timeline-inner-spacing,
14+
$cadmin-timeline-inner-spacing
15+
);
16+
17+
$timeline-border-width: if(
18+
variable-exists(timeline-border-width),
19+
$timeline-border-width,
20+
$cadmin-timeline-border-width
21+
);
22+
23+
$timeline-border-modifier: if(
24+
variable-exists(timeline-border-modifier),
25+
$timeline-border-modifier,
26+
$cadmin-timeline-border-modifier
27+
);
28+
529
/// A mixin that places the `.timeline-item::before` element on the right side. This mixin is used in `.timeline-right`.
630
/// @todo
731
/// - Add @link to documentation

0 commit comments

Comments
 (0)