fix #143

sass-basis · Aug 27, 2021 · ca6cf38 · ca6cf38
1 parent 3e5e59f
commit ca6cf38
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 33 deletions.
diff --git a/src/css/core/abstract/_navbar.scss b/src/css/core/abstract/_navbar.scss
@@ -165,8 +165,7 @@ new BasisNavbar({
 
   &__submenu {
     @include _list-unstyled();
-    min-width: 220px;
-    white-space: nowrap;
+    min-width: 240px;
     opacity: 0;
     visibility: hidden;
     @include _transition(opacity);

diff --git a/src/css/object/component/_drawer.scss b/src/css/object/component/_drawer.scss
@@ -109,7 +109,7 @@ Drawer component
 ```
 */
 
-.#{$_prefix}c-drawer {
+.#{ $_prefix }c-drawer {
   @include _drawer();
   @include _transition(left, right, visibility);
   transition-timing-function: ease-in;
@@ -154,14 +154,13 @@ Drawer component
         max-width: calc(100% - 42px);
       }
 
-      > .#{$_prefix}c-drawer__toggle {
+      > .#{ $_prefix }c-drawer__toggle {
         flex: 0 0 auto;
-        max-width: 42px;
-        width: 100%;
+        width: 42px;
         overflow: hidden;
       }
 
-      > .#{$_prefix}c-drawer__submenu {
+      > .#{ $_prefix }c-drawer__submenu {
         flex: 1 1 100%;
       }
     }

diff --git a/src/css/object/component/_dropdown.scss b/src/css/object/component/_dropdown.scss
@@ -51,7 +51,7 @@ Dropdown component
 ```
 */
 
-.#{$_prefix}c-dropdown {
+.#{ $_prefix }c-dropdown {
   @include _dropdown();
   @include _transition(bottom, visibility);
   transition-timing-function: ease-in;
@@ -89,14 +89,13 @@ Dropdown component
         max-width: calc(100% - 42px);
       }
 
-      > .#{$_prefix}c-dropdown__toggle {
+      > .#{ $_prefix }c-dropdown__toggle {
         flex: 0 0 auto;
-        max-width: 42px;
-        width: 100%;
+        width: 42px;
         overflow: hidden;
       }
 
-      > .#{$_prefix}c-dropdown__submenu {
+      > .#{ $_prefix }c-dropdown__submenu {
         flex: 1 1 100%;
       }
     }

diff --git a/src/css/object/component/_navbar.scss b/src/css/object/component/_navbar.scss
@@ -210,64 +210,68 @@ Navbar component
 ```
 */
 
-.#{$_prefix}c-navbar {
+.#{ $_prefix }c-navbar {
   @include _navbar();
 
   &--center {
     justify-content: center;
 
-    .#{$_prefix}c-navbar__item {
+    .#{ $_prefix }c-navbar__item {
       flex: 0 1 auto;
     }
   }
 
   &--left {
-    .#{$_prefix}c-navbar__item {
+    .#{ $_prefix }c-navbar__item {
       flex: 0 1 auto;
     }
   }
 
   &--right {
     justify-content: flex-end;
 
-    .#{$_prefix}c-navbar__item {
+    .#{ $_prefix }c-navbar__item {
       flex: 0 1 auto;
 
-      > .#{$_prefix}c-navbar__submenu {
+      > .#{ $_prefix }c-navbar__submenu {
         @include _position(absolute, 100%, 0, null, auto);
       }
     }
 
-    .#{$_prefix}c-navbar__subitem {
-      > .#{$_prefix}c-navbar__submenu {
+    .#{ $_prefix }c-navbar__subitem {
+      > .#{ $_prefix }c-navbar__submenu {
         @include _position(absolute, 0, 100%, null, auto);
       }
     }
   }
 
   &[data-popup-mode="click"] {
-    .#{$_prefix}c-navbar__item,
-    .#{$_prefix}c-navbar__subitem {
+    .#{ $_prefix }c-navbar__item,
+    .#{ $_prefix }c-navbar__subitem {
       position: relative;
-      display: flex;
-      justify-content: space-between;
 
       &[aria-haspopup="true"] {
+        display: flex;
+        justify-content: space-between;
+
+        > * {
+          flex: 1 1 auto;
+        }
+
         > a {
-          padding-right: 1rem;
+          @include _padding-right(.5);
           max-width: calc(100% - 42px);
         }
-      }
 
-      > a {
-        flex: 1 1 auto;
-      }
+        > .#{ $_prefix }c-navbar__toggle {
+          flex: 0 0 auto;
+          width: 42px;
+          overflow: hidden;
+        }
 
-      > .#{$_prefix}c-navbar__toggle {
-        flex: 0 0 auto;
-        max-width: 42px;
-        width: 100%;
-        overflow: hidden;
+        > .#{ $_prefix }c-navbar__submenu {
+          flex: 1 1 100%;
+        }
       }
     }
   }