1 files changed, 15 insertions, 19 deletions

diff --git a/src/objects/_button.scss b/src/objects/_button.scss
index 0467f24..8fbec78 100644
--- a/src/objects/_button.scss
+++ b/src/objects/_button.scss
@@ -36,7 +36,7 @@
             props.get(vars.$shadow-blur)
             props.get(vars.$shadow-grow)
             props.get($theme, list.join($key, --shadow-color)...);
-
+            
         &:hover,
         &:focus-visible {
             color:            props.get($theme, list.join($key, --hover --label-color)...);
@@ -52,31 +52,31 @@
         }
     }
 
-    @include bem.modifier('static') {
-        color:            props.get($theme, list.join($key, --static --label-color)...);
-        background-color: props.get($theme, list.join($key, --static --bg-color)...);
-        border-color:     props.get($theme, list.join($key, --static --border-color)...);
+    @include bem.modifier('badge') {
+        color:            props.get($theme, list.join($key, --badge --label-color)...);
+        background-color: props.get($theme, list.join($key, --badge --bg-color)...);
+        border-color:     props.get($theme, list.join($key, --badge --border-color)...);
         box-shadow:       none;
 
         &:link,
         &:visited,
         &:enabled {
-            color:            props.get($theme, list.join($key, --static --label-color)...);
-            background-color: props.get($theme, list.join($key, --static --bg-color)...);
-            border-color:     props.get($theme, list.join($key, --static --border-color)...);
+            color:            props.get($theme, list.join($key, --badge --label-color)...);
+            background-color: props.get($theme, list.join($key, --badge --bg-color)...);
+            border-color:     props.get($theme, list.join($key, --badge --border-color)...);
             box-shadow:       none;
 
             &:hover,
             &:focus-visible {
-                color:            props.get($theme, list.join($key, --static --hover --label-color)...);
-                background-color: props.get($theme, list.join($key, --static --hover --bg-color)...);
-                border-color:     props.get($theme, list.join($key, --static --hover --border-color)...);
+                color:            props.get($theme, list.join($key, --badge --hover --label-color)...);
+                background-color: props.get($theme, list.join($key, --badge --hover --bg-color)...);
+                border-color:     props.get($theme, list.join($key, --badge --hover --border-color)...);
             }
 
             &:active {
-                color:            props.get($theme, list.join($key, --static --active --label-color)...);
-                background-color: props.get($theme, list.join($key, --static --active --bg-color)...);
-                border-color:     props.get($theme, list.join($key, --static --active --border-color)...);
+                color:            props.get($theme, list.join($key, --badge --active --label-color)...);
+                background-color: props.get($theme, list.join($key, --badge --active --bg-color)...);
+                border-color:     props.get($theme, list.join($key, --badge --active --border-color)...);
             }
         }
     }
@@ -114,7 +114,7 @@
         background-color: props.get($theme, list.join($key, --selected --disabled --bg-color)...);
         border-color:     props.get($theme, list.join($key, --selected --disabled --border-color)...);
 
-        @include bem.modifier('static') {
+        @include bem.multi('&:link, &:visited, &:enabled', 'modifier' 'badge') {
             color:            props.get($theme, list.join($key, --selected --label-color)...);
             background-color: props.get($theme, list.join($key, --selected --bg-color)...);
             border-color:     props.get($theme, list.join($key, --selected --border-color)...);
@@ -123,10 +123,6 @@
         &:link,
         &:visited,
         &:enabled {
-            color:            props.get($theme, list.join($key, --selected --label-color)...);
-            background-color: props.get($theme, list.join($key, --selected --bg-color)...);
-            border-color:     props.get($theme, list.join($key, --selected --border-color)...);
-    
             &:hover,
             &:focus-visible {
                 color:            props.get($theme, list.join($key, --selected --hover --label-color)...);