Skip to content

Commit 69fcb3f

Browse files
committed
Merge branch 'v4-dev' of https://github.com/coreui/coreui into v4-dev-sync
# Conflicts: # scss/sidebar/_sidebar.scss
2 parents f009cb7 + f1d19db commit 69fcb3f

File tree

2 files changed

+5
-23
lines changed

2 files changed

+5
-23
lines changed

scss/_accordion.scss

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

6060
.accordion-item {
6161
margin-bottom: -$accordion-border-width;
62-
background-color: $accordion-bg;
62+
background-color: var(--#{$variable-prefix}accordion-bg, $accordion-bg);
6363
border: $accordion-border-width solid var(--#{$variable-prefix}accordion-border-color, $accordion-border-color);
6464

6565
&:first-of-type {

scss/sidebar/_sidebar.scss

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,36 +33,18 @@
3333
border-color: rgba($black, .1);
3434
}
3535

36-
&.hide {
37-
&:not(.sidebar-end){
38-
@include ltr-rtl("margin-left", - $sidebar-width);
39-
~ * {
40-
--#{$variable-prefix}sidebar-occupy-start: 0;
41-
}
42-
}
43-
&.sidebar-end {
44-
@include ltr-rtl("margin-right", - $sidebar-width);
45-
~ * {
46-
--#{$variable-prefix}sidebar-occupy-end: 0;
47-
}
48-
}
49-
}
50-
5136
@each $width, $value in $sidebar-widths {
5237
&.sidebar-#{$width} {
5338
flex: 0 0 $value;
5439
width: $value;
5540

56-
&:not(.sidebar-end).hide {
57-
@include ltr-rtl("margin-left", - $value);
58-
59-
&:not(.sidebar-overlaid) ~ * {
41+
&:not(.sidebar-end) {
42+
~ * {
6043
--#{$variable-prefix}sidebar-occupy-start: #{$value};
6144
}
6245
}
63-
&.sidebar-end.hide {
64-
@include ltr-rtl("margin-right", - $value);
65-
&:not(.sidebar-overlaid) ~ * {
46+
&.sidebar-end {
47+
~ * {
6648
--#{$variable-prefix}sidebar-occupy-end: #{$value};
6749
}
6850
}

0 commit comments

Comments
 (0)