Skip to content

Commit ef61c27

Browse files
committed
Merge branch 'v5' of https://github.com/coreui/coreui into v5
2 parents f695338 + 2dc586e commit ef61c27

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

docs/assets/scss/_component-examples.scss

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
//
44

55
.tab-content .tab-pane .docs-code-snippet {
6-
border-top-left-radius: 0;
7-
border-top-right-radius: 0;
6+
@include border-top-radius(0);
87

98
.highlight {
10-
border-top-left-radius: 0;
11-
border-top-right-radius: 0;
9+
@include border-top-radius(0);
1210
}
1311
}
1412

scss/_buttons.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
box-shadow: var(--#{$prefix}btn-focus-box-shadow);
109109
}
110110
}
111-
111+
112112
&:disabled,
113113
&.disabled,
114114
fieldset:disabled & {

scss/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2441,4 +2441,4 @@ $time-picker-inline-select-padding-x: $input-padding-x-sm !default;
24412441
$time-picker-inline-select-disabled-color: $input-disabled-color !default;
24422442
// scss-docs-end time-picker-variables
24432443

2444-
@import "variables-dark"; // TODO: can be removed safely in v6, only here to avoid breaking changes in v5
2444+
@import "variables-dark"; // TODO: can be removed safely in v6, only here to avoid breaking changes in v5

scss/sidebar/_sidebar-nav.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@
139139
}
140140

141141
&.nav-dropdown-toggle::after {
142-
mask-image: var(--#{$prefix}sidebar-nav-group-indicator-hover-icon);
143142
background-color: var(--#{$prefix}sidebar-nav-group-indicator-hover-color);
143+
mask-image: var(--#{$prefix}sidebar-nav-group-indicator-hover-icon);
144144
}
145145
}
146146
}
@@ -161,8 +161,8 @@
161161
}
162162

163163
&.nav-group-toggle::after {
164-
mask-image: var(--#{$prefix}sidebar-nav-group-indicator-hover-icon);
165164
background-color: var(--#{$prefix}sidebar-nav-group-indicator-hover-color);
165+
mask-image: var(--#{$prefix}sidebar-nav-group-indicator-hover-icon);
166166
}
167167
}
168168
}
@@ -239,8 +239,8 @@
239239
height: 12px;
240240
@include ltr-rtl("margin-left", auto);
241241
content: "";
242-
mask-image: var(--#{$prefix}sidebar-nav-group-indicator-icon);
243242
background-color: var(--#{$prefix}sidebar-nav-group-indicator-color);
243+
mask-image: var(--#{$prefix}sidebar-nav-group-indicator-icon);
244244
@include transition($sidebar-nav-group-indicator-transition);
245245
}
246246
}

scss/tests/mixins/_auto-import-of-variables-dark.test.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
@import "../../variables";
55
// Voluntarily not importing _variables-dark.scss
66
@import "../../maps";
7-
@import "../../mixins";
7+
@import "../../mixins";

scss/themes/bootstrap/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
$variable-prefix: cui- !default; // Deprecated in v4.2.6 for the shorter `$prefix`
2-
$prefix: $variable-prefix !default;
2+
$prefix: $variable-prefix !default;

scss/themes/bootstrap/bootstrap.rtl.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@ $enable-rtl: true !default;
2626
@import "../../sidebar";
2727
@import "../../time-picker";
2828
@import "../../forms/form-multi-select";
29-
/* rtl:end:ignore */
29+
30+
/* rtl:end:ignore */

scss/themes/bootstrap/bootstrap.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@
2323
@import "../../sidebar";
2424
@import "../../time-picker";
2525
@import "../../forms/form-multi-select";
26+
2627
/* rtl:end:ignore */

0 commit comments

Comments
 (0)