Merge branch 'v5' of https://github.com/coreui/coreui into v5

coreui · Mar 17, 2024 · ef61c27 · ef61c27
2 parents f695338 + 2dc586e
commit ef61c27
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/docs/assets/scss/_component-examples.scss b/docs/assets/scss/_component-examples.scss
@@ -3,12 +3,10 @@
 //
 
 .tab-content .tab-pane .docs-code-snippet {
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
+  @include border-top-radius(0);
 
   .highlight {
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
+    @include border-top-radius(0);
   }
 }
 

diff --git a/scss/_buttons.scss b/scss/_buttons.scss
@@ -108,7 +108,7 @@
       box-shadow: var(--#{$prefix}btn-focus-box-shadow);
     }
   }
-  
+
   &:disabled,
   &.disabled,
   fieldset:disabled & {

diff --git a/scss/_variables.scss b/scss/_variables.scss
@@ -2441,4 +2441,4 @@ $time-picker-inline-select-padding-x:       $input-padding-x-sm !default;
 $time-picker-inline-select-disabled-color:  $input-disabled-color !default;
 // scss-docs-end time-picker-variables
 
-@import "variables-dark"; // TODO: can be removed safely in v6, only here to avoid breaking changes in v5
+@import "variables-dark"; // TODO: can be removed safely in v6, only here to avoid breaking changes in v5
diff --git a/scss/sidebar/_sidebar-nav.scss b/scss/sidebar/_sidebar-nav.scss
@@ -139,8 +139,8 @@
         }
 
         &.nav-dropdown-toggle::after {
-          mask-image: var(--#{$prefix}sidebar-nav-group-indicator-hover-icon);
           background-color: var(--#{$prefix}sidebar-nav-group-indicator-hover-color);
+          mask-image: var(--#{$prefix}sidebar-nav-group-indicator-hover-icon);
         }
       }
     }
@@ -161,8 +161,8 @@
         }
 
         &.nav-group-toggle::after {
-          mask-image: var(--#{$prefix}sidebar-nav-group-indicator-hover-icon);
           background-color: var(--#{$prefix}sidebar-nav-group-indicator-hover-color);
+          mask-image: var(--#{$prefix}sidebar-nav-group-indicator-hover-icon);
         }
       }
     }
@@ -239,8 +239,8 @@
       height: 12px;
       @include ltr-rtl("margin-left", auto);
       content: "";
-      mask-image: var(--#{$prefix}sidebar-nav-group-indicator-icon);
       background-color: var(--#{$prefix}sidebar-nav-group-indicator-color);
+      mask-image: var(--#{$prefix}sidebar-nav-group-indicator-icon);
       @include transition($sidebar-nav-group-indicator-transition);
     }
   }

diff --git a/scss/tests/mixins/_auto-import-of-variables-dark.test.scss b/scss/tests/mixins/_auto-import-of-variables-dark.test.scss
@@ -4,4 +4,4 @@
 @import "../../variables";
 // Voluntarily not importing _variables-dark.scss
 @import "../../maps";
-@import "../../mixins";
+@import "../../mixins";
diff --git a/scss/themes/bootstrap/_variables.scss b/scss/themes/bootstrap/_variables.scss
@@ -1,2 +1,2 @@
 $variable-prefix:             cui- !default; // Deprecated in v4.2.6 for the shorter `$prefix`
-$prefix:                      $variable-prefix !default;
+$prefix:                      $variable-prefix !default;
diff --git a/scss/themes/bootstrap/bootstrap.rtl.scss b/scss/themes/bootstrap/bootstrap.rtl.scss
@@ -26,4 +26,5 @@ $enable-rtl: true !default;
 @import "../../sidebar";
 @import "../../time-picker";
 @import "../../forms/form-multi-select";
-/* rtl:end:ignore */
+
+/* rtl:end:ignore */
diff --git a/scss/themes/bootstrap/bootstrap.scss b/scss/themes/bootstrap/bootstrap.scss
@@ -23,4 +23,5 @@
 @import "../../sidebar";
 @import "../../time-picker";
 @import "../../forms/form-multi-select";
+
 /* rtl:end:ignore */