@graupl/graupl 1.0.0-beta.1 → 1.0.0-beta.10

package/{src → packages/core/src}/scss/component/card/_variables.scss

@@ -1,4 +1,4 @@
-// @graupl/graupl card component variables.
+// @graupl/core card component variables.
 //
 // These values are to be used to directly style components and provide a
 // cleaner way to reference custom properties.
@@ -60,47 +60,77 @@ $card-gap: var(
 // Card color properties.
 $card-background: var(
   --#{root-defaults.$prefix}card-background,
-  #{color.$root-background}
+  #{color.$background}
 );
-$card-color: var(--#{root-defaults.$prefix}card-color, #{color.$root-color});
+$card-color: var(--#{root-defaults.$prefix}card-color, #{color.$color});
 
 // Card border-properties.
 $card-border-color: var(
   --#{root-defaults.$prefix}card-border-color,
   #{$card-color}
 );
-$card-top-left-border-radius: var(
-  --#{root-defaults.$prefix}card-top-left-border-radius,
-  #{root-variables.$border-radius}
+$card-border-top-left-radius: var(
+  --#{root-defaults.$prefix}card-border-top-left-radius,
+  #{root-variables.$border-top-left-radius}
 );
-$card-top-right-border-radius: var(
-  --#{root-defaults.$prefix}card-top-right-border-radius,
-  #{root-variables.$border-radius}
+$card-border-top-right-radius: var(
+  --#{root-defaults.$prefix}card-border-top-right-radius,
+  #{root-variables.$border-top-right-radius}
 );
-$card-bottom-left-border-radius: var(
-  --#{root-defaults.$prefix}card-bottom-left-border-radius,
-  #{root-variables.$border-radius}
+$card-border-bottom-left-radius: var(
+  --#{root-defaults.$prefix}card-border-bottom-left-radius,
+  #{root-variables.$border-bottom-left-radius}
 );
-$card-bottom-right-border-radius: var(
-  --#{root-defaults.$prefix}card-bottom-right-border-radius,
-  #{root-variables.$border-radius}
+$card-border-bottom-right-radius: var(
+  --#{root-defaults.$prefix}card-border-bottom-right-radius,
+  #{root-variables.$border-bottom-right-radius}
 );
 $card-border-radius: var(
   --#{root-defaults.$prefix}card-border-radius,
-  #{$card-top-left-border-radius} #{$card-top-right-border-radius}
-    #{$card-bottom-right-border-radius} #{$card-bottom-left-border-radius}
+  #{$card-border-top-left-radius} #{$card-border-top-right-radius}
+    #{$card-border-bottom-right-radius} #{$card-border-bottom-left-radius}
 );
-$card-border-style: var(
-  --#{root-defaults.$prefix}card-border-style,
-  #{root-variables.$border-style}
+$card-border-top-width: var(
+  --#{root-defaults.$prefix}card-border-top-width,
+  #{root-variables.$border-top-width}
+);
+$card-border-right-width: var(
+  --#{root-defaults.$prefix}card-border-right-width,
+  #{root-variables.$border-right-width}
+);
+$card-border-bottom-width: var(
+  --#{root-defaults.$prefix}card-border-bottom-width,
+  #{root-variables.$border-bottom-width}
+);
+$card-border-left-width: var(
+  --#{root-defaults.$prefix}card-border-left-width,
+  #{root-variables.$border-left-width}
 );
 $card-border-width: var(
   --#{root-defaults.$prefix}card-border-width,
-  #{root-variables.$border-width}
+  #{$card-border-top-width} #{$card-border-right-width}
+    #{$card-border-bottom-width} #{$card-border-left-width}
+);
+$card-border-top-style: var(
+  --#{root-defaults.$prefix}card-border-top-style,
+  #{root-variables.$border-top-style}
 );
-$card-border: var(
-  --#{root-defaults.$prefix}card-border,
-  #{$card-border-width} #{$card-border-style}
+$card-border-right-style: var(
+  --#{root-defaults.$prefix}card-border-right-style,
+  #{root-variables.$border-right-style}
+);
+$card-border-bottom-style: var(
+  --#{root-defaults.$prefix}card-border-bottom-style,
+  #{root-variables.$border-bottom-style}
+);
+$card-border-left-style: var(
+  --#{root-defaults.$prefix}card-border-left-style,
+  #{root-variables.$border-left-style}
+);
+$card-border-style: var(
+  --#{root-defaults.$prefix}card-border-style,
+  #{$card-border-top-style} #{$card-border-right-style}
+    #{$card-border-bottom-style} #{$card-border-left-style}
 );
 
 // Card layout properties.

package/{src → packages/core/src}/scss/component/carousel/_defaults.scss

@@ -1,4 +1,4 @@
-// @graupl/graupl carousel component default values.
+// @graupl/core carousel component default values.
 //
 // Generally, these should not be used directly when styling components unless a static value is needed.
 // They are mainly used to provide class selectors, fallbacks for custom properties, or loop values.

package/{src → packages/core/src}/scss/component/carousel/_index.scss

@@ -1,4 +1,4 @@
-// @graupl/graupl carousel component styles.
+// @graupl/core carousel component styles.
 
 @use "defaults";
 @use "variables" as *;
@@ -7,8 +7,18 @@
 @use "../../base/button/variables" as button-variables;
 @use "../../base/button/mixins" as button-mixins;
 
-#{defaults.$carousel-selector} {
-  @include layer(component) {
+@include layer(base) {
+  #{defaults.$carousel-control-selector} {
+    @include button-mixins.apply-base;
+  }
+
+  #{defaults.$carousel-tab-selector} {
+    @include button-mixins.apply-base;
+  }
+}
+
+@include layer(component) {
+  #{defaults.$carousel-selector} {
     display: grid;
     position: relative;
     grid-template-columns: [slide-start controls-start] auto [tabs-start] $carousel-tabs-width [tabs-end] auto [controls-end slide-end];
@@ -56,10 +66,8 @@
       }
     }
   }
-}
 
-#{defaults.$carousel-control-container-selector} {
-  @include layer(component) {
+  #{defaults.$carousel-control-container-selector} {
     display: grid;
     z-index: 1;
     grid-area: controls;
@@ -70,12 +78,8 @@
     grid-template-rows: [autoplay-start next-start previous-start] $carousel-control-height [previous-end next-end autoplay-end];
     pointer-events: none;
   }
-}
 
-#{defaults.$carousel-control-selector} {
-  @include button-mixins.apply-button;
-
-  @include layer(component) {
+  #{defaults.$carousel-control-selector} {
     pointer-events: auto;
 
     &#{defaults.$carousel-autoplay-selector} {
@@ -110,10 +114,8 @@
       }
     }
   }
-}
 
-#{defaults.$carousel-item-container-selector} {
-  @include layer(component) {
+  #{defaults.$carousel-item-container-selector} {
     display: grid;
     z-index: 0;
     grid-area: slide;
@@ -122,10 +124,8 @@
     overflow-x: hidden;
     isolation: isolate;
   }
-}
 
-#{defaults.$carousel-item-selector} {
-  @include layer(component) {
+  #{defaults.$carousel-item-selector} {
     z-index: -1;
     grid-area: items;
     max-width: $carousel-item-max-width;
@@ -163,10 +163,8 @@
       }
     }
   }
-}
 
-#{defaults.$carousel-tab-container-selector} {
-  @include layer(component) {
+  #{defaults.$carousel-tab-container-selector} {
     display: flex;
     z-index: 1;
     grid-area: tabs;
@@ -175,14 +173,20 @@
     gap: $carousel-tab-container-gap;
     pointer-events: none;
   }
-}
 
-#{defaults.$carousel-tab-selector} {
-  @include button-mixins.apply-button;
-
-  @include layer(component) {
+  #{defaults.$carousel-tab-selector} {
     --#{root-defaults.$prefix}button-border-radius: 50%;
 
     pointer-events: auto;
   }
 }
+
+@include layer(theme) {
+  #{defaults.$carousel-control-selector} {
+    @include button-mixins.apply-theme;
+  }
+
+  #{defaults.$carousel-tab-selector} {
+    @include button-mixins.apply-theme;
+  }
+}

package/{src → packages/core/src}/scss/component/carousel/_variables.scss

@@ -1,4 +1,4 @@
-// @graupl/graupl carousel component variables.
+// @graupl/core carousel component variables.
 //
 // These values are to be used to directly style components and provide a
 // cleaner way to reference custom properties.

package/{src → packages/core/src}/scss/component/input-group/_defaults.scss

@@ -1,4 +1,4 @@
-// @graupl/graupl input group component default values.
+// @graupl/core input group component default values.
 //
 // Generally, these should not be used directly when styling components unless a static value is needed.
 // They are mainly used to provide class selectors, fallbacks for custom properties, or loop values.

package/{src → packages/core/src}/scss/component/input-group/_index.scss

@@ -1,4 +1,4 @@
-// @graupl/graupl input group component styles.
+// @graupl/core input group component styles.
 
 @use "defaults";
 @use "../../base/form/defaults" as form-defaults;
@@ -37,7 +37,7 @@
     }
   }
 
-  @include screen.up(xs) {
+  @include screen.down(xs) {
     #{defaults.$input-group-selector}#{defaults.$input-group-inline-selector} {
       grid-template-areas: $input-group-grid-template-areas;
       grid-template-columns: $input-group-grid-template-columns;

package/{src → packages/core/src}/scss/component/input-group/_variables.scss

@@ -1,4 +1,4 @@
-// @graupl/graupl input group component variables.
+// @graupl/core input group component variables.
 //
 // These values are to be used to directly style components and provide a
 // cleaner way to reference custom properties.

package/{src/scss/utilities/order → packages/core/src/scss/component/list}/_defaults.scss

@@ -1,4 +1,4 @@
-// @graupl/graupl order utilities default values.
+// @graupl/core list component default values.
 //
 // Generally, these should not be used directly when styling components unless a static value is needed.
 // They are mainly used to provide class selectors, fallbacks for custom properties, or loop values.
@@ -6,17 +6,10 @@
 // They should not be used to define direct property values (i.e. font-size, color, etc.).
 // Those should be defined as custom properties in the `_variables.scss` file.
 
-@use "sass:map";
+// Card selectors.
+$list-selector: ".list" !default;
+$list-item-selector: ".list-item" !default;
 
-// Order properties.
-$order-class-prefix: "order-" !default;
-$base-order-properties: (
-  "none": 0,
-  "first": -9999,
-  "last": 9999,
-);
-$custom-order-properties: () !default;
-$order-properties: map.merge($base-order-properties, $custom-order-properties);
-
-// Responsive utility flag.
-$responsive: true !default;
+// List item properties.
+$list-item-transform: none !default;
+$list-item-hover-transform: $list-item-transform !default;

package/packages/core/src/scss/component/list/_index.scss

@@ -0,0 +1,52 @@
+// @graupl/core card component styles.
+
+@use "../../defaults" as root-defaults;
+@use "../../mixins/animation";
+@use "../../mixins/layer" as *;
+@use "defaults";
+@use "sass:map";
+@use "variables" as *;
+
+@include layer(component) {
+  #{defaults.$list-selector} {
+    display: grid;
+    position: relative;
+    margin: $list-margin;
+    padding: $list-padding;
+    border-width: $list-border-width;
+    border-style: $list-border-style;
+    border-radius: $list-border-radius;
+    list-style: none;
+    gap: $list-gap;
+  }
+
+  #{defaults.$list-item-selector} {
+    position: relative;
+    padding: $list-item-padding;
+    transform: $list-item-transform;
+    transition: $list-item-transition;
+    border-width: $list-item-border-width;
+    border-style: $list-item-border-style;
+    border-radius: $list-item-border-radius;
+
+    @each $selector in map.get(root-defaults.$state-selectors, hover) {
+      &#{$selector} {
+        --#{root-defaults.$prefix}list-item-transform: $list-item-hover-transform;
+      }
+    }
+  }
+}
+
+@include layer(theme) {
+  #{defaults.$list-selector} {
+    border-color: $list-border-color;
+    background: $list-background;
+    color: $list-color;
+  }
+
+  #{defaults.$list-item-selector} {
+    border-color: $list-item-border-color;
+    background: $list-item-background;
+    color: $list-item-color;
+  }
+}

package/packages/core/src/scss/component/list/_variables.scss

@@ -0,0 +1,236 @@
+// @graupl/core list component variables.
+//
+// These values are to be used to directly style components and provide a
+// cleaner way to reference custom properties.
+
+@use "../../defaults" as root-defaults;
+@use "../../theme/color/variables" as color;
+@use "../../variables" as root-variables;
+@use "defaults";
+@use "sass:map";
+
+// List properties.
+$list-padding-x: var(
+  --#{root-defaults.$prefix}list-padding-x,
+  #{map.get(root-variables.$spacers, 0)}
+);
+$list-padding-y: var(
+  --#{root-defaults.$prefix}list-padding-y,
+  #{map.get(root-variables.$spacers, 0)}
+);
+$list-padding: var(
+  --#{root-defaults.$prefix}list-padding,
+  #{$list-padding-y} #{$list-padding-x}
+);
+$list-margin-x: var(
+  --#{root-defaults.$prefix}list-margin-x,
+  #{map.get(root-variables.$spacers, 0)}
+);
+$list-margin-y: var(
+  --#{root-defaults.$prefix}list-margin-y,
+  #{map.get(root-variables.$spacers, 0)}
+);
+$list-margin: var(
+  --#{root-defaults.$prefix}list-margin,
+  #{$list-margin-y} #{$list-margin-x}
+);
+
+// List gap properties.
+$list-column-gap: var(
+  --#{root-defaults.$prefix}list-column-gap,
+  #{map.get(root-variables.$spacers, 2)}
+);
+$list-row-gap: var(
+  --#{root-defaults.$prefix}list-row-gap,
+  #{map.get(root-variables.$spacers, 2)}
+);
+$list-gap: var(
+  --#{root-defaults.$prefix}list-gap,
+  #{$list-column-gap} #{$list-row-gap}
+);
+
+// List color properties.
+$list-background: var(
+  --#{root-defaults.$prefix}list-background,
+  #{color.$background}
+);
+$list-color: var(--#{root-defaults.$prefix}list-color, #{color.$color});
+
+// List border-properties.
+$list-border-color: var(
+  --#{root-defaults.$prefix}list-border-color,
+  #{$list-color}
+);
+$list-border-top-left-radius: var(
+  --#{root-defaults.$prefix}list-border-top-left-radius,
+  #{root-variables.$border-top-left-radius}
+);
+$list-border-top-right-radius: var(
+  --#{root-defaults.$prefix}list-border-top-right-radius,
+  #{root-variables.$border-top-right-radius}
+);
+$list-border-bottom-left-radius: var(
+  --#{root-defaults.$prefix}list-border-bottom-left-radius,
+  #{root-variables.$border-bottom-left-radius}
+);
+$list-border-bottom-right-radius: var(
+  --#{root-defaults.$prefix}list-border-bottom-right-radius,
+  #{root-variables.$border-bottom-right-radius}
+);
+$list-border-radius: var(
+  --#{root-defaults.$prefix}list-border-radius,
+  #{$list-border-top-left-radius} #{$list-border-top-right-radius}
+    #{$list-border-bottom-right-radius} #{$list-border-bottom-left-radius}
+);
+$list-border-top-width: var(--#{root-defaults.$prefix}list-border-top-width, 0);
+$list-border-right-width: var(
+  --#{root-defaults.$prefix}list-border-right-width,
+  0
+);
+$list-border-bottom-width: var(
+  --#{root-defaults.$prefix}list-border-bottom-width,
+  0
+);
+$list-border-left-width: var(
+  --#{root-defaults.$prefix}list-border-left-width,
+  0
+);
+$list-border-width: var(
+  --#{root-defaults.$prefix}list-border-width,
+  #{$list-border-top-width} #{$list-border-right-width}
+    #{$list-border-bottom-width} #{$list-border-left-width}
+);
+$list-border-top-style: var(
+  --#{root-defaults.$prefix}list-border-top-style,
+  #{root-variables.$border-top-style}
+);
+$list-border-right-style: var(
+  --#{root-defaults.$prefix}list-border-right-style,
+  #{root-variables.$border-right-style}
+);
+$list-border-bottom-style: var(
+  --#{root-defaults.$prefix}list-border-bottom-style,
+  #{root-variables.$border-bottom-style}
+);
+$list-border-left-style: var(
+  --#{root-defaults.$prefix}list-border-left-style,
+  #{root-variables.$border-left-style}
+);
+$list-border-style: var(
+  --#{root-defaults.$prefix}list-border-style,
+  #{$list-border-top-style} #{$list-border-right-style}
+    #{$list-border-bottom-style} #{$list-border-left-style}
+);
+
+// List item properties.
+$list-item-padding-x: var(
+  --#{root-defaults.$prefix}list-item-padding-x,
+  #{map.get(root-variables.$spacers, 5)}
+);
+$list-item-padding-y: var(
+  --#{root-defaults.$prefix}list-item-padding-y,
+  #{map.get(root-variables.$spacers, 3)}
+);
+$list-item-padding: var(
+  --#{root-defaults.$prefix}list-item-padding,
+  #{$list-item-padding-y} #{$list-item-padding-x}
+);
+$list-item-transition: var(
+  --#{root-defaults.$prefix}list-item-transition,
+  transform #{map.get(root-variables.$transition-durations, fast)}
+    #{root-variables.$transition-timing-function}
+);
+$list-item-transition-reduced-motion: var(
+  --#{root-defaults.$prefix}list-item-transition-reduced-motion,
+  none
+);
+
+// List item transform properties.
+$list-item-transform: var(
+  --#{root-defaults.$prefix}list-item-transform,
+  #{defaults.$list-item-transform}
+);
+$list-item-hover-transform: var(
+  --#{root-defaults.$prefix}list-item-hover-transform,
+  #{defaults.$list-item-hover-transform}
+);
+
+// List item color properties.
+$list-item-background: var(
+  --#{root-defaults.$prefix}list-item-background,
+  #{color.$background}
+);
+$list-item-color: var(
+  --#{root-defaults.$prefix}list-item-color,
+  #{color.$color}
+);
+
+// List item border-properties.
+$list-item-border-color: var(
+  --#{root-defaults.$prefix}list-item-border-color,
+  #{$list-item-color}
+);
+$list-item-border-top-left-radius: var(
+  --#{root-defaults.$prefix}list-item-border-top-left-radius,
+  #{root-variables.$border-top-left-radius}
+);
+$list-item-border-top-right-radius: var(
+  --#{root-defaults.$prefix}list-item-border-top-right-radius,
+  #{root-variables.$border-top-right-radius}
+);
+$list-item-border-bottom-left-radius: var(
+  --#{root-defaults.$prefix}list-item-border-bottom-left-radius,
+  #{root-variables.$border-bottom-left-radius}
+);
+$list-item-border-bottom-right-radius: var(
+  --#{root-defaults.$prefix}list-item-border-bottom-right-radius,
+  #{root-variables.$border-bottom-right-radius}
+);
+$list-item-border-radius: var(
+  --#{root-defaults.$prefix}list-item-border-radius,
+  #{$list-item-border-top-left-radius} #{$list-item-border-top-right-radius}
+    #{$list-item-border-bottom-right-radius}
+    #{$list-item-border-bottom-left-radius}
+);
+$list-item-border-top-width: var(
+  --#{root-defaults.$prefix}list-item-border-top-width,
+  #{root-variables.$border-top-width}
+);
+$list-item-border-right-width: var(
+  --#{root-defaults.$prefix}list-item-border-right-width,
+  #{root-variables.$border-right-width}
+);
+$list-item-border-bottom-width: var(
+  --#{root-defaults.$prefix}list-item-border-bottom-width,
+  #{root-variables.$border-bottom-width}
+);
+$list-item-border-left-width: var(
+  --#{root-defaults.$prefix}list-item-border-left-width,
+  #{root-variables.$border-left-width}
+);
+$list-item-border-width: var(
+  --#{root-defaults.$prefix}list-item-border-width,
+  #{$list-item-border-top-width} #{$list-item-border-right-width}
+    #{$list-item-border-bottom-width} #{$list-item-border-left-width}
+);
+$list-item-border-top-style: var(
+  --#{root-defaults.$prefix}list-item-border-top-style,
+  #{root-variables.$border-top-style}
+);
+$list-item-border-right-style: var(
+  --#{root-defaults.$prefix}list-item-border-right-style,
+  #{root-variables.$border-right-style}
+);
+$list-item-border-bottom-style: var(
+  --#{root-defaults.$prefix}list-item-border-bottom-style,
+  #{root-variables.$border-bottom-style}
+);
+$list-item-border-left-style: var(
+  --#{root-defaults.$prefix}list-item-border-left-style,
+  #{root-variables.$border-left-style}
+);
+$list-item-border-style: var(
+  --#{root-defaults.$prefix}list-item-border-style,
+  #{$list-item-border-top-style} #{$list-item-border-right-style}
+    #{$list-item-border-bottom-style} #{$list-item-border-left-style}
+);

package/{src → packages/core/src}/scss/component/menu/_defaults.scss

@@ -1,4 +1,4 @@
-// @graupl/graupl menu component default values.
+// @graupl/core menu component default values.
 //
 // Generally, these should not be used directly when styling components unless a static value is needed.
 // They are mainly used to provide class selectors, fallbacks for custom properties, or loop values.
@@ -41,26 +41,17 @@ $submenu-left: 0 !default;
 $submenu-item-width: 100% !default;
 
 // Menu link properties.
-$menu-link-text-decoration: none !default;
-$menu-link-visited-text-decoration: $menu-link-text-decoration !default;
-$menu-link-focus-text-decoration: $menu-link-text-decoration !default;
-$menu-link-hover-text-decoration: $menu-link-text-decoration !default;
-$menu-link-active-text-decoration: $menu-link-text-decoration !default;
-$menu-link-disabled-text-decoration: $menu-link-text-decoration !default;
-$menu-link-text-decoration-style: solid !default;
-$menu-link-visited-text-decoration-style: $menu-link-text-decoration-style !default;
-$menu-link-focus-text-decoration-style: $menu-link-text-decoration-style !default;
-$menu-link-hover-text-decoration-style: $menu-link-text-decoration-style !default;
-$menu-link-active-text-decoration-style: $menu-link-text-decoration-style !default;
-$menu-link-disabled-text-decoration-style: $menu-link-text-decoration-style !default;
-$menu-link-transform: none !default;
-$menu-link-visited-transform: $menu-link-transform !default;
-$menu-link-focus-transform: $menu-link-transform !default;
-$menu-link-hover-transform: $menu-link-transform !default;
-$menu-link-active-transform: $menu-link-transform !default;
-$menu-link-disabled-transform: $menu-link-transform !default;
+$menu-link-initial-text-decoration: none !default;
+$menu-link-final-text-decoration: $menu-link-initial-text-decoration !default;
+$menu-link-disabled-text-decoration: $menu-link-initial-text-decoration !default;
+$menu-link-initial-text-decoration-style: solid !default;
+$menu-link-final-text-decoration-style: $menu-link-initial-text-decoration-style !default;
+$menu-link-disabled-text-decoration-style: $menu-link-initial-text-decoration-style !default;
+$menu-link-initial-transform: none !default;
+$menu-link-final-transform: $menu-link-initial-transform !default;
+$menu-link-disabled-transform: $menu-link-initial-transform !default;
 $menu-border-width: 0 !default;
 $menu-link-border-width: 0 !default;
 $submenu-toggle-transform: rotate(0deg) !default;
 $submenu-toggle-open-transform: rotate(-180deg) !default;
-$submenu-toggle-content: "'▼'" !default;
+$submenu-toggle-content: "'↓'" !default;

package/{src → packages/core/src}/scss/component/menu/_index.scss

@@ -1,4 +1,4 @@
-// @graupl/graupl menu component styles.
+// @graupl/core menu component styles.
 
 @use "defaults";
 @use "variables" as *;
@@ -42,7 +42,8 @@
     display: $menu-display;
     flex-direction: $menu-flex-direction;
     padding: $menu-padding;
-    border: $menu-border;
+    border-width: $menu-border-width;
+    border-style: $menu-border-style;
     border-radius: $menu-border-radius;
     list-style: none;
     gap: $menu-gap;
@@ -64,7 +65,8 @@
     flex: 1 1;
     flex-direction: $submenu-flex-direction;
     padding: $submenu-padding;
-    border: $submenu-border;
+    border-width: $submenu-border-width;
+    border-style: $submenu-border-style;
     border-radius: $submenu-border-radius;
     list-style: none;
     gap: $submenu-gap;
@@ -97,7 +99,8 @@
     padding: $menu-link-padding;
     transform: $menu-link-transform;
     transition: $menu-link-transition;
-    border: $menu-link-border;
+    border-width: $menu-link-border-width;
+    border-style: $menu-link-border-style;
     border-radius: $menu-link-border-radius;
     text-decoration: $menu-link-text-decoration;
     text-decoration-style: $menu-link-text-decoration-style;
@@ -146,7 +149,7 @@
       }
     }
 
-    &#{button-defaults.$button-selector} {
+    &#{button-defaults.$button-selector-base}#{button-defaults.$button-selector} {
       --#{root-defaults.$prefix}menu-link-padding: #{button-variables.$button-padding};
       --#{root-defaults.$prefix}menu-link-border-width: #{button-variables.$button-border-width};
       --#{root-defaults.$prefix}menu-link-border-radius: #{button-variables.$button-border-radius};
@@ -281,7 +284,7 @@
       }
     }
 
-    &#{button-defaults.$button-selector} {
+    &#{button-defaults.$button-selector-base}#{button-defaults.$button-selector} {
       --#{root-defaults.$prefix}menu-link-background: #{button-variables.$button-background};
       --#{root-defaults.$prefix}menu-link-color: #{button-variables.$button-color};
       --#{root-defaults.$prefix}menu-link-border-color: #{button-variables.$button-border-color};