@coreui/coreui 5.0.0-alpha.1 → 5.0.0-alpha.2

package/scss/mixins/_caret.scss

@@ -35,7 +35,7 @@
   @if $enable-caret {
     &::after {
       display: inline-block;
-      margin-left: $spacing;
+      @include ltr-rtl("margin-left", $spacing);
       vertical-align: $vertical-align;
       content: "";
       @if $direction == down {
@@ -54,7 +54,7 @@
 
       &::before {
         display: inline-block;
-        margin-right: $spacing;
+        @include ltr-rtl("margin-right", $spacing);
         vertical-align: $vertical-align;
         content: "";
         @include caret-start($width);
@@ -62,7 +62,7 @@
     }
 
     &:empty::after {
-      margin-left: 0;
+      @include ltr-rtl("margin-left", 0);
     }
   }
 }

package/scss/sidebar/_sidebar-narrow.scss

@@ -1,4 +1,13 @@
 %sidebar-narrow {
+  // scss-docs-start sidebar-narrow-css-vars
+  --#{$prefix}sidebar-narrow-width: #{$sidebar-narrow-width};
+  // scss-docs-end sidebar-narrow-css-vars
+
+  .sidebar-nav {
+    --#{$prefix}sidebar-nav-link-padding-x: #{$sidebar-narrow-nav-link-padding-x};
+    --#{$prefix}sidebar-nav-link-padding-y: #{$sidebar-narrow-nav-link-padding-y};
+  }
+
   @include media-breakpoint-up($mobile-breakpoint) {
     z-index: $zindex-fixed + 1;
     flex: 0 0 var(--#{$prefix}sidebar-narrow-width);
@@ -19,14 +28,22 @@
       display: block;
     }
 
+    .sidebar-header {
+      justify-content: center;
+      padding-right: 0;
+      padding-left: 0;
+    }
+
+    .nav-icon {
+      flex: 0 0 calc(var(--#{$prefix}sidebar-narrow-width) - (var(--#{$prefix}sidebar-nav-padding-x) * 2) - (var(--#{$prefix}sidebar-nav-link-padding-x) * 2)); // stylelint-disable-line function-disallowed-list
+    }
+
     .d-narrow-none,
     .nav-label,
     .nav-title,
     .nav-group-items,
     .nav-group.show .nav-group-items,
-    .sidebar-footer,
-    .sidebar-form,
-    .sidebar-header {
+    .sidebar-form {
       height: 0 !important; // stylelint-disable-line declaration-no-important
       padding: 0;
       margin: 0;
@@ -35,12 +52,7 @@
     }
 
     .sidebar-toggler {
-      position: fixed;
-      bottom: 0;
-
-      &::before {
-        @include ltr-rtl("transform", rotate(-180deg), null, rotate(0deg));
-      }
+      @include ltr-rtl("transform", rotate(-180deg), null, rotate(0deg));
     }
 
     &.sidebar-end .sidebar-toggler::before {
@@ -57,6 +69,10 @@
   &.sidebar-end ~ * {
     --#{$prefix}sidebar-occupy-end: #{$sidebar-narrow-width};
   }
+
+  .nav-link {
+    overflow: hidden;
+  }
 }
 
 .sidebar-narrow-unfoldable {
@@ -75,16 +91,20 @@
   }
 
   &:hover {
+    box-shadow: $box-shadow;
+
     .sidebar-toggler {
-      &::before {
-        @include ltr-rtl("transform", rotate(-180deg), null, rotate(0deg));
-      }
+      @include ltr-rtl("transform", rotate(-180deg), null, rotate(0deg));
     }
 
-    &.sidebar-end .sidebar-toggler::before {
+    &.sidebar-end .sidebar-toggler {
       transform: rotate(0deg);
     }
   }
+
+  .nav-link {
+    overflow: hidden;
+  }
 }
 
 // Responsive behavior

package/scss/sidebar/_sidebar-nav.scss

@@ -1,16 +1,79 @@
 // Sidebar navigation
 
 .sidebar-nav {
+  // scss-docs-start sidebar-nav-css-vars
+  --#{$prefix}sidebar-nav-padding-x: #{$sidebar-nav-padding-x};
+  --#{$prefix}sidebar-nav-padding-y: #{$sidebar-nav-padding-y};
+
+  --#{$prefix}sidebar-nav-title-padding-x: #{$sidebar-nav-title-padding-x};
+  --#{$prefix}sidebar-nav-title-padding-y: #{$sidebar-nav-title-padding-y};
+  --#{$prefix}sidebar-nav-title-margin-top: #{$sidebar-nav-title-margin-top};
+  --#{$prefix}sidebar-nav-title-color: #{$sidebar-nav-title-color};
+
+  --#{$prefix}sidebar-nav-link-padding-x: #{$sidebar-nav-link-padding-x};
+  --#{$prefix}sidebar-nav-link-padding-y: #{$sidebar-nav-link-padding-y};
+  --#{$prefix}sidebar-nav-link-color: #{$sidebar-nav-link-color};
+  --#{$prefix}sidebar-nav-link-bg: #{$sidebar-nav-link-bg};
+  --#{$prefix}sidebar-nav-link-border-color: #{$sidebar-nav-link-border-color};
+  --#{$prefix}sidebar-nav-link-border-radius: #{$sidebar-nav-link-border-radius};
+  --#{$prefix}sidebar-nav-link-border-width: #{$sidebar-nav-link-border-width};
+
+  --#{$prefix}sidebar-nav-link-active-color: #{$sidebar-nav-link-active-color};
+  --#{$prefix}sidebar-nav-link-active-bg: #{$sidebar-nav-link-active-bg};
+  --#{$prefix}sidebar-nav-link-disabled-color: #{$sidebar-nav-link-disabled-color};
+  --#{$prefix}sidebar-nav-link-hover-color: #{$sidebar-nav-link-hover-color};
+  --#{$prefix}sidebar-nav-link-hover-bg: #{$sidebar-nav-link-hover-bg};
+
+  --#{$prefix}sidebar-nav-link-icon-margin: #{$sidebar-nav-link-icon-margin};
+  --#{$prefix}sidebar-nav-link-icon-color: #{$sidebar-nav-link-icon-color};
+  --#{$prefix}sidebar-nav-link-icon-width: #{$sidebar-nav-link-icon-width};
+  --#{$prefix}sidebar-nav-link-icon-height: #{$sidebar-nav-link-icon-height};
+  --#{$prefix}sidebar-nav-link-icon-font-size: #{$sidebar-nav-link-icon-font-size};
+  --#{$prefix}sidebar-nav-link-active-icon-color: #{$sidebar-nav-link-active-icon-color};
+  --#{$prefix}sidebar-nav-link-disabled-icon-color: #{$sidebar-nav-link-disabled-icon-color};
+  --#{$prefix}sidebar-nav-link-hover-icon-color: #{$sidebar-nav-link-hover-icon-color};
+
+  --#{$prefix}sidebar-nav-link-icon-bullet-size: #{$sidebar-nav-link-icon-bullet-size};
+  --#{$prefix}sidebar-nav-link-icon-bullet-bg: #{$sidebar-nav-link-icon-bullet-bg};
+  --#{$prefix}sidebar-nav-link-icon-bullet-border-width: #{$sidebar-nav-link-icon-bullet-border-width};
+  --#{$prefix}sidebar-nav-link-icon-bullet-border-radius: #{$sidebar-nav-link-icon-bullet-border-radius};
+  --#{$prefix}sidebar-nav-link-icon-bullet-border-color: #{$sidebar-nav-link-icon-bullet-border-color};
+  --#{$prefix}sidebar-nav-link-active-icon-bullet-bg: #{$sidebar-nav-link-active-icon-bullet-bg};
+  --#{$prefix}sidebar-nav-link-active-icon-bullet-border-color: #{$sidebar-nav-link-active-icon-bullet-border-color};
+  --#{$prefix}sidebar-nav-link-disabled-icon-bullet-bg: #{$sidebar-nav-link-disabled-icon-bullet-bg};
+  --#{$prefix}sidebar-nav-link-disabled-icon-bullet-border-color: #{$sidebar-nav-link-disabled-icon-bullet-border-color};
+  --#{$prefix}sidebar-nav-link-hover-icon-bullet-bg: #{$sidebar-nav-link-hover-icon-bullet-bg};
+  --#{$prefix}sidebar-nav-link-hover-icon-bullet-border-color: #{$sidebar-nav-link-hover-icon-bullet-border-color};
+
+  --#{$prefix}sidebar-nav-group-bg: #{$sidebar-nav-group-bg};
+  --#{$prefix}sidebar-nav-group-border-width: #{$sidebar-nav-group-border-width};
+  --#{$prefix}sidebar-nav-group-border-radius: #{$sidebar-nav-group-border-radius};
+  --#{$prefix}sidebar-nav-group-border-color: #{$sidebar-nav-group-border-color};
+  --#{$prefix}sidebar-nav-group-items-padding-y: #{$sidebar-nav-group-items-padding-y};
+  --#{$prefix}sidebar-nav-group-items-padding-x: #{$sidebar-nav-group-items-padding-x};
+  --#{$prefix}sidebar-nav-group-indicator-color: #{escape-svg($sidebar-nav-group-indicator-color)};
+  --#{$prefix}sidebar-nav-group-indicator-icon: #{escape-svg($sidebar-nav-group-indicator-icon)};
+  --#{$prefix}sidebar-nav-group-indicator-hover-color: #{escape-svg($sidebar-nav-group-indicator-hover-color)};
+  --#{$prefix}sidebar-nav-group-indicator-hover-icon: #{escape-svg($sidebar-nav-group-indicator-hover-icon)};
+  --#{$prefix}sidebar-nav-group-toggle-show-color: #{$sidebar-nav-group-toggle-show-color};
+  // scss-docs-end sidebar-nav-css-vars
+
   position: relative;
   display: flex;
   flex: 1;
   flex-direction: column;
-  padding: 0;
+  padding: var(--#{$prefix}sidebar-nav-padding-y) var(--#{$prefix}sidebar-nav-padding-x);
   margin-bottom: 0;
   overflow-x: hidden;
   overflow-y: auto;
   list-style: none;
 
+  .nav-item + .nav-item,
+  .nav-item + .nav-group,
+  .nav-group + .nav-item {
+    margin-top: 1px;
+  }
+
   .nav-title {
     padding: var(--#{$prefix}sidebar-nav-title-padding-y) var(--#{$prefix}sidebar-nav-title-padding-x);
     margin-top: var(--#{$prefix}sidebar-nav-title-margin-top);
@@ -30,7 +93,7 @@
     text-decoration: none;
     white-space: nowrap;
     background: var(--#{$prefix}sidebar-nav-link-bg);
-    border: var(--#{$prefix}sidebar-nav-link-border);
+    border: var(--#{$prefix}sidebar-nav-link-border-width) solid var(--#{$prefix}sidebar-nav-link-border-color);
     @include border-radius(var(--#{$prefix}sidebar-nav-link-border-radius));
     @include transition($sidebar-nav-link-transition);
 
@@ -41,6 +104,11 @@
       .nav-icon {
         color: var(--#{$prefix}sidebar-nav-link-active-icon-color);
       }
+
+      .nav-icon-bullet {
+        background: var(--#{$prefix}sidebar-link-active-icon-bullet-bg);
+        border-color: var(--#{$prefix}sidebar-link-active-icon-bullet-border-color);
+      }
     }
 
     &.disabled {
@@ -53,6 +121,11 @@
         color: var(--#{$prefix}sidebar-nav-link-disabled-icon-color);
       }
 
+      .nav-icon-bullet {
+        background: var(--#{$prefix}sidebar-link-disabled-icon-bullet-bg);
+        border-color: var(--#{$prefix}sidebar-link-disabled-icon-bullet-border-color);
+      }
+
       &:hover {
         color: var(--#{$prefix}sidebar-nav-link-disabled-color);
 
@@ -60,8 +133,14 @@
           color: var(--#{$prefix}sidebar-nav-link-disabled-icon-color);
         }
 
+        .nav-icon-bullet {
+          background: var(--#{$prefix}sidebar-link-disabled-icon-bullet-bg);
+          border-color: var(--#{$prefix}sidebar-link-disabled-icon-bullet-border-color);
+        }
+
         &.nav-dropdown-toggle::after {
-          background-image: var(--#{$prefix}sidebar-nav-group-indicator-hover);
+          mask-image: var(--#{$prefix}sidebar-nav-group-indicator-hover-icon);
+          background-color: var(--#{$prefix}sidebar-nav-group-indicator-hover-color);
         }
       }
     }
@@ -76,27 +155,43 @@
           color: var(--#{$prefix}sidebar-nav-link-hover-icon-color);
         }
 
+        .nav-icon-bullet {
+          background: var(--#{$prefix}sidebar-link-hover-icon-bullet-bg);
+          border-color: var(--#{$prefix}sidebar-link-hover-icon-bullet-border-color);
+        }
+
         &.nav-group-toggle::after {
-          background-image: var(--#{$prefix}sidebar-nav-group-indicator-hover);
+          mask-image: var(--#{$prefix}sidebar-nav-group-indicator-hover-icon);
+          background-color: var(--#{$prefix}sidebar-nav-group-indicator-hover-color);
         }
       }
     }
   }
 
   .nav-icon {
-    flex: 0 0 var(--#{$prefix}sidebar-nav-icon-width);
-    height: var(--#{$prefix}sidebar-nav-icon-height);
-    font-size: var(--#{$prefix}sidebar-nav-icon-font-size);
+    display: flex;
+    flex: 0 0 var(--#{$prefix}sidebar-nav-link-icon-width);
+    align-items: center;
+    justify-content: center;
+    height: var(--#{$prefix}sidebar-nav-link-icon-height);
+    @include ltr-rtl("margin-right", var(--#{$prefix}sidebar-nav-link-icon-margin));
+    font-size: var(--#{$prefix}sidebar-nav-link-icon-font-size);
     color: var(--#{$prefix}sidebar-nav-link-icon-color);
     text-align: center;
     pointer-events: none;
     fill: currentcolor;
     @include transition(inherit);
+  }
 
-    &:first-child {
-      @include ltr-rtl("margin-left", calc(var(--#{$prefix}sidebar-nav-link-padding-x) * -1));
-    }
+  .nav-icon-bullet {
+    display: inline-block;
+    width: var(--#{$prefix}sidebar-nav-link-icon-bullet-size);
+    height: var(--#{$prefix}sidebar-nav-link-icon-bullet-size);
+    background: var(--#{$prefix}sidebar-nav-link-icon-bullet-bg);
+    border: var(--#{$prefix}sidebar-nav-link-icon-bullet-border-width) solid var(--#{$prefix}sidebar-nav-link-icon-bullet-border-color);
+    border-radius: var(--#{$prefix}sidebar-nav-link-icon-bullet-border-radius); // stylelint-disable-line property-disallowed-list
   }
+
   // stylelint-disable-next-line selector-no-qualifying-type
   svg.nav-icon {
     overflow: hidden; // fix chrome 105+ width issue
@@ -104,6 +199,8 @@
 
   .nav-group {
     position: relative;
+    border: var(--#{$prefix}sidebar-nav-group-border-width) solid var(--#{$prefix}sidebar-nav-group-border-color);
+    @include border-radius(var(--#{$prefix}sidebar-nav-group-border-radius));
     @include transition($sidebar-nav-group-transition);
 
     .nav-group-items {
@@ -142,9 +239,8 @@
       height: 12px;
       @include ltr-rtl("margin-left", auto);
       content: "";
-      background-image: var(--#{$prefix}sidebar-nav-group-indicator);
-      background-repeat: no-repeat;
-      background-position: center;
+      mask-image: var(--#{$prefix}sidebar-nav-group-indicator-icon);
+      background-color: var(--#{$prefix}sidebar-nav-group-indicator-color);
       @include transition($sidebar-nav-group-indicator-transition);
     }
   }
@@ -154,19 +250,18 @@
     list-style: none;
 
     .nav-link {
-      @include ltr-rtl("padding-left", var(--#{$prefix}sidebar-nav-icon-width));
+      @include ltr-rtl("padding-left", calc(var(--#{$prefix}sidebar-nav-link-padding-x) + var(--#{$prefix}sidebar-nav-link-icon-width) + var(--#{$prefix}sidebar-nav-link-icon-margin)));
+    }
 
-      .nav-icon {
-        @include ltr-rtl("margin-left", calc(var(--#{$prefix}sidebar-nav-icon-width) * -1));
-      }
+    .nav-icon {
+      @include ltr-rtl("margin-left", calc((var(--#{$prefix}sidebar-nav-link-icon-width) + var(--#{$prefix}sidebar-nav-link-icon-margin)) * -1));
     }
   }
 
   &.compact,
   .compact {
     .nav-link {
-      padding-top: calc(var(--#{$prefix}sidebar-nav-link-padding-y) * .5); // stylelint-disable-line function-disallowed-list
-      padding-bottom: calc(var(--#{$prefix}sidebar-nav-link-padding-y) * .5); // stylelint-disable-line function-disallowed-list
+      --#{$prefix}sidebar-nav-link-padding-y: #{calc($sidebar-nav-link-padding-y * .75)};
     }
   }
 }

package/scss/sidebar/_sidebar.scss

@@ -1,3 +1,5 @@
+// stylelint-disable function-disallowed-list
+
 .sidebar {
   // scss-docs-start sidebar-css-vars
   --#{$prefix}sidebar-width: #{$sidebar-width};
@@ -5,56 +7,8 @@
   --#{$prefix}sidebar-padding-x: #{$sidebar-padding-x};
   --#{$prefix}sidebar-padding-y: #{$sidebar-padding-y};
   --#{$prefix}sidebar-color: #{$sidebar-color};
-  --#{$prefix}sidebar-border-width: #{$sidebar-border-width};
-  --#{$prefix}sidebar-border-color: #{$sidebar-border-color};
   --#{$prefix}sidebar-brand-color: #{$sidebar-brand-color};
-  --#{$prefix}sidebar-brand-height: #{$sidebar-brand-height};
   --#{$prefix}sidebar-brand-bg: #{$sidebar-brand-bg};
-  --#{$prefix}sidebar-header-height: #{$sidebar-header-height};
-  --#{$prefix}sidebar-header-bg: #{$sidebar-header-bg};
-  --#{$prefix}sidebar-header-padding-x: #{$sidebar-header-padding-x};
-  --#{$prefix}sidebar-header-padding-y: #{$sidebar-header-padding-y};
-  --#{$prefix}sidebar-footer-bg: #{$sidebar-footer-bg};
-  --#{$prefix}sidebar-footer-height: #{$sidebar-footer-height};
-  --#{$prefix}sidebar-footer-padding-x: #{$sidebar-footer-padding-x};
-  --#{$prefix}sidebar-footer-padding-y: #{$sidebar-footer-padding-y};
-  --#{$prefix}sidebar-toggler-bg: #{$sidebar-toggler-bg};
-  --#{$prefix}sidebar-toggler-height: #{$sidebar-toggler-height};
-  --#{$prefix}sidebar-toggler-indicator: #{escape-svg($sidebar-toggler-indicator-icon)};
-  --#{$prefix}sidebar-toggler-indicator-width: #{$sidebar-toggler-indicator-width};
-  --#{$prefix}sidebar-toggler-indicator-height: #{$sidebar-toggler-indicator-height};
-  --#{$prefix}sidebar-toggler-hover-bg: #{$sidebar-toggler-hover-bg};
-  --#{$prefix}sidebar-toggler-indicator-hover: #{escape-svg($sidebar-toggler-indicator-hover-icon)};
-  --#{$prefix}sidebar-narrow-width: #{$sidebar-narrow-width};
-  --#{$prefix}sidebar-nav-title-padding-x: #{$sidebar-nav-title-padding-x};
-  --#{$prefix}sidebar-nav-title-padding-y: #{$sidebar-nav-title-padding-y};
-  --#{$prefix}sidebar-nav-title-margin-top: #{$sidebar-nav-title-margin-top};
-  --#{$prefix}sidebar-nav-title-color: #{$sidebar-nav-title-color};
-  --#{$prefix}sidebar-nav-link-padding-x: #{$sidebar-nav-link-padding-x};
-  --#{$prefix}sidebar-nav-link-padding-y: #{$sidebar-nav-link-padding-y};
-  --#{$prefix}sidebar-nav-link-color: #{$sidebar-nav-link-color};
-  --#{$prefix}sidebar-nav-link-bg: #{$sidebar-nav-link-bg};
-  --#{$prefix}sidebar-nav-link-border-color: #{$sidebar-nav-link-border-color};
-  --#{$prefix}sidebar-nav-link-border: #{$sidebar-nav-link-border-width} solid var(--#{$prefix}sidebar-nav-link-border-color);
-  --#{$prefix}sidebar-nav-link-border-radius: #{$sidebar-nav-link-border-radius};
-  --#{$prefix}sidebar-nav-link-active-color: #{$sidebar-nav-link-active-color};
-  --#{$prefix}sidebar-nav-link-active-bg: #{$sidebar-nav-link-active-bg};
-  --#{$prefix}sidebar-nav-link-active-icon-color: #{$sidebar-nav-link-active-icon-color};
-  --#{$prefix}sidebar-nav-link-disabled-color: #{$sidebar-nav-link-disabled-color};
-  --#{$prefix}sidebar-nav-link-disabled-icon-color: #{$sidebar-nav-link-disabled-icon-color};
-  --#{$prefix}sidebar-nav-link-hover-color: #{$sidebar-nav-link-hover-color};
-  --#{$prefix}sidebar-nav-link-hover-bg: #{$sidebar-nav-link-hover-bg};
-  --#{$prefix}sidebar-nav-link-hover-icon-color: #{$sidebar-nav-link-hover-icon-color};
-  --#{$prefix}sidebar-nav-icon-width: #{$sidebar-nav-icon-width};
-  --#{$prefix}sidebar-nav-icon-height: #{$sidebar-nav-icon-height};
-  --#{$prefix}sidebar-nav-icon-font-size: #{$sidebar-nav-icon-font-size};
-  --#{$prefix}sidebar-nav-link-icon-color: #{$sidebar-nav-link-icon-color};
-  --#{$prefix}sidebar-nav-group-bg: #{$sidebar-nav-group-bg};
-  --#{$prefix}sidebar-nav-group-items-padding-y: #{$sidebar-nav-group-items-padding-y};
-  --#{$prefix}sidebar-nav-group-items-padding-x: #{$sidebar-nav-group-items-padding-x};
-  --#{$prefix}sidebar-nav-group-indicator: #{escape-svg($sidebar-nav-group-indicator-icon)};
-  --#{$prefix}sidebar-nav-group-indicator-hover: #{escape-svg($sidebar-nav-group-indicator-hover-icon)};
-  --#{$prefix}sidebar-nav-group-toggle-show-color: #{$sidebar-nav-group-toggle-show-color};
   // scss-docs-end sidebar-css-vars
 
   position: relative;
@@ -65,10 +19,8 @@
   // put the nav on the left
   order: -1;
   width: var(--#{$prefix}sidebar-width);
-  padding: var(--#{$prefix}sidebar-padding-y) var(--#{$prefix}sidebar-padding-x);
   color: var(--#{$prefix}sidebar-color);
   background: var(--#{$prefix}sidebar-bg);
-  @include ltr-rtl("border-right", var(--#{$prefix}sidebar-border-width) solid var(--#{$prefix}sidebar-border-color));
   box-shadow: none;
   @include transition($sidebar-transition);
 
@@ -87,10 +39,6 @@
     }
   }
 
-  &[class*="bg-"]  {
-    border-color: rgba($black, .1);
-  }
-
   @each $width, $value in $sidebar-widths {
     &.sidebar-#{$width} {
       --#{$prefix}sidebar-width: #{$value};
@@ -157,17 +105,21 @@
     bottom: 0;
     z-index: $zindex-fixed + 2;
 
+    &:not(.hide) {
+      box-shadow: $box-shadow;
+    }
+
     &:not(.sidebar-end) {
       @include ltr-rtl("left", 0);
       ~ * {
-        --#{$prefix}sidebar-occupy-start: 0;
+        --#{$prefix}sidebar-occupy-start: 0 !important;  // stylelint-disable-line
       }
     }
 
     &.sidebar-end {
       @include ltr-rtl("right", 0);
       ~ * {
-        --#{$prefix}sidebar-occupy-end: 0;
+        --#{$prefix}sidebar-occupy-end: 0 !important;  // stylelint-disable-line
       }
     }
   }
@@ -203,32 +155,9 @@
   }
 }
 
-.sidebar-close {
-  position: absolute;
-  top: 0;
-  @include ltr-rtl("right", 0);
-  width: var(--#{$prefix}sidebar-width);
-  height: var(--#{$prefix}sidebar-header-height);
-  color: var(--#{$prefix}sidebar-color);
-  background: transparent;
-  border: 0;
-
-  &:hover {
-    text-decoration: none;
-  }
-
-  &:focus {
-    outline: 0;
-  }
-}
-
 .sidebar-brand {
-  display: flex;
-  flex: 0 0 var(--#{$prefix}sidebar-brand-height);
-  align-items: center;
-  justify-content: center;
   color: var(--#{$prefix}sidebar-brand-color);
-  background: var(--#{$prefix}sidebar-brand-bg);
+  white-space: nowrap;
 
   .sidebar-brand-narrow {
     display: none;
@@ -236,74 +165,87 @@
 }
 
 .sidebar-header {
-  flex: 0 0 var(--#{$prefix}sidebar-header-height);
-  padding: var(--#{$prefix}sidebar-header-padding-y) var(--#{$prefix}sidebar-header-padding-x);
-  text-align: center;
-  background: var(--#{$prefix}sidebar-header-bg);
-  @include transition($sidebar-header-height-transition);
-
-  .nav-link {
-    display: flex;
-    align-items: center;
-    min-height: var(--#{$prefix}sidebar-header-height);
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: var(--#{$prefix}sidebar-padding-y) var(--#{$prefix}sidebar-padding-x);
+
+  .btn-close {
+    padding: calc(var(--#{$prefix}sidebar-padding-y) * .5) calc(var(--#{$prefix}sidebar-padding-x) * .5);
+    margin-top: calc(-.5 * var(--#{$prefix}sidebar-padding-y));
+    @include ltr-rtl("margin-right", calc(-.5 * var(--#{$prefix}sidebar-padding-x)));
+    margin-bottom: calc(-.5 * var(--#{$prefix}sidebar-padding-y));
   }
 }
 
+.sidebar-body {
+  padding: var(--#{$prefix}sidebar-padding-y) var(--#{$prefix}sidebar-padding-x);
+}
+
 .sidebar-footer {
-  flex: 0 0 var(--#{$prefix}sidebar-footer-height);
-  padding: var(--#{$prefix}sidebar-footer-padding-y) var(--#{$prefix}sidebar-footer-padding-x);
-  background: var(--#{$prefix}sidebar-footer-bg);
-  @include transition($sidebar-footer-height-transition);
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: var(--#{$prefix}sidebar-padding-y) var(--#{$prefix}sidebar-padding-x);
 }
 
 .sidebar-toggler {
-  display: flex;
-  flex: 0 0 var(--#{$prefix}sidebar-toggler-height);
-  justify-content: flex-end;
-  width: inherit;
-  padding: 0;
-  cursor: pointer;
-  background-color: var(--#{$prefix}sidebar-toggler-bg);
-  border: 0;
+  // scss-docs-start sidebar-toggler-css-vars
+  --#{$prefix}sidebar-toggler-width: #{$sidebar-toggler-width};
+  --#{$prefix}sidebar-toggler-height: #{$sidebar-toggler-height};
+  --#{$prefix}sidebar-toggler-color: #{$sidebar-toggler-color};
+  --#{$prefix}sidebar-toggler-bg: #{ escape-svg($sidebar-toggler-bg) };
+  --#{$prefix}sidebar-toggler-hover-color: #{$sidebar-toggler-hover-color};
+  --#{$prefix}sidebar-toggler-focus-shadow: #{$sidebar-toggler-focus-shadow};
+  --#{$prefix}sidebar-toggler-focus-color: #{$sidebar-toggler-focus-color};
+  --#{$prefix}sidebar-toggler-transition: #{$sidebar-toggler-transition};
+  // scss-docs-end sidebar-toggler-css-vars
 
-  @include media-breakpoint-down($mobile-breakpoint) {
-    display: none;
-  }
+  position: relative;
+  box-sizing: content-box;
+  width: var(--#{$prefix}sidebar-toggler-width);
+  height: var(--#{$prefix}sidebar-toggler-height);
+  padding: $sidebar-toggler-padding-y $sidebar-toggler-padding-x;
+  background-color: transparent;
+  border: 0;
+  @include border-radius();
+  @include transition(var(--#{$prefix}sidebar-toggler-transition));
 
   &::before {
-    display: block;
-    width: var(--#{$prefix}sidebar-toggler-indicator-width);
-    height: var(--#{$prefix}sidebar-toggler-indicator-height);
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
     content: "";
-    background-image: var(--#{$prefix}sidebar-toggler-indicator);
-    background-repeat: no-repeat;
-    background-position: center;
-    background-size: calc(var(--#{$prefix}sidebar-toggler-indicator-height) * .25); // stylelint-disable-line function-disallowed-list
-    @include transition($sidebar-toggler-transition);
-    @include rtl() {
-      transform: rotate(-180deg);
+    background-color: var(--#{$prefix}sidebar-toggler-color);
+    mask: var(--#{$prefix}sidebar-toggler-bg) no-repeat center;
+  }
+
+  // Override <a>'s hover style
+  &:hover {
+    text-decoration: none;
+    &::before {
+      background-color: var(--#{$prefix}sidebar-toggler-hover-color);
     }
   }
 
   &:focus {
+    position: relative;
     outline: 0;
-  }
+    box-shadow: var(--#{$prefix}sidebar-toggler-focus-shadow);
 
-  &:hover {
-    background-color: var(--#{$prefix}sidebar-toggler-hover-bg);
     &::before {
-      background-image: var(--#{$prefix}sidebar-toggler-indicator-hover);
+      background-color: var(--#{$prefix}sidebar-toggler-focus-color);
     }
   }
 
-  .sidebar-end & {
-    justify-content: flex-start;
-    &::before {
-      transform: rotate(-180deg);
-    }
+  @include media-breakpoint-down($mobile-breakpoint) {
+    display: none;
   }
 }
 
+
 // Backdrop background
 
 .sidebar-backdrop {
@@ -318,12 +260,21 @@
   }
 }
 
-@if $enable-dark-mode {
-  @include color-mode(dark) {
-    .sidebar {
-      --#{$prefix}sidebar-bg: #{$sidebar-bg-dark};
-      --#{$prefix}sidebar-border-width: #{$sidebar-border-width-dark};
-      --#{$prefix}sidebar-border-color: #{$sidebar-border-color-dark};
-    }
+.sidebar-dark {
+  --#{$prefix}body-color: #{$body-color-dark};
+  --#{$prefix}body-bg: #{$body-bg-dark};
+
+  --#{$prefix}emphasis-color: #{$body-emphasis-color-dark};
+
+  --#{$prefix}secondary-color: #{$body-secondary-color-dark};
+  --#{$prefix}secondary-bg: #{$body-secondary-bg-dark};
+
+  --#{$prefix}tertiary-color: #{$body-tertiary-color-dark};
+  --#{$prefix}tertiary-bg: #{$body-tertiary-bg-dark};
+
+  --#{$prefix}border-color: #{$border-color-dark};
+
+  .sidebar-toggler {
+    filter: var(--#{$prefix}sidebar-toggler-white-filter);
   }
 }