3 files changed, 33 insertions, 45 deletions

diff --git a/tpl/objects/button.pug b/tpl/objects/button.pug
index b9b4cbd..c356bfe 100644
--- a/tpl/objects/button.pug
+++ b/tpl/objects/button.pug
@@ -4,13 +4,13 @@ mixin button
     -
         let classes = {
             'o-button':            true,
-            'u-d-block':                  attributes.block,
+            'u-d-block':           attributes.block,
             'o-button--secondary': attributes.secondary,
             'o-button--quiet':     attributes.quiet,
             'o-button--pill':      attributes.pill,
-            'o-button--static':    attributes.static,
+            'o-button--badge':     attributes.badge,
             'o-button--icon':      !!attributes.icon && !block,
-            'is-selected':                attributes.selected,
+            'is-selected':         attributes.selected,
         }
         if (attributes.theme) {
             classes['o-button--' + attributes.theme] = true
@@ -24,25 +24,13 @@ mixin button
 
         let href = attributes.disabled ? null : '#';
 
-    if attributes.badge
-        span(class=classes href=href)
-            if attributes.icon
-                +icon(attributes.icon)
-                = ' '
-            if block
-                span.o-button__label
-                    block
-            if attributes.postIcon
-                = ' '
-                +icon(attributes.postIcon)
-    else
-        a(class=classes href=href)
-            if attributes.icon
-                +icon(attributes.icon)
-                = ' '
-            if block
-                span.o-button__label
-                    block
-            if attributes.postIcon
-                = ' '
-                +icon(attributes.postIcon)
+    a(class=classes href=href)
+        if attributes.icon
+            +icon(attributes.icon)
+            = ' '
+        if block
+            span.o-button__label
+                block
+        if attributes.postIcon
+            = ' '
+            +icon(attributes.postIcon)
diff --git a/tpl/views/button.pug b/tpl/views/button.pug
index 7e03e04..2e54458 100644
--- a/tpl/views/button.pug
+++ b/tpl/views/button.pug
@@ -78,16 +78,16 @@ mixin view-button
             +button(selected=true disabled=true)= 'Selected + disabled'
             br
             br
-            +button(static=true )= 'Idle'
+            +button(badge=true)= 'Idle'
             = ' '
-            +button(static=true selected=true)= 'Selected'
+            +button(badge=true selected=true)= 'Selected'
             = ' '
-            +button(static=true disabled=true)= 'Disabled'
+            +button(badge=true disabled=true)= 'Disabled'
             = ' '
-            +button(static=true selected=true disabled=true)= 'Selected + disabled'
+            +button(badge=true selected=true disabled=true)= 'Selected + disabled'
             br
             br
-            +button(quiet=true )= 'Idle'
+            +button(quiet=true)= 'Idle'
             = ' '
             +button(quiet=true selected=true)= 'Selected'
             = ' '
@@ -105,13 +105,13 @@ mixin view-button
             +button(pill=true selected=true disabled=true)= 'Selected + disabled'
             br
             br
-            +button(pill=true static=true)= 'Idle'
+            +button(pill=true badge=true)= 'Idle'
             = ' '
-            +button(pill=true static=true selected=true)= 'Selected'
+            +button(pill=true badge=true selected=true)= 'Selected'
             = ' '
-            +button(pill=true static=true disabled=true)= 'Disabled'
+            +button(pill=true badge=true disabled=true)= 'Disabled'
             = ' '
-            +button(pill=true static=true selected=true disabled=true)= 'Selected + disabled'
+            +button(pill=true badge=true selected=true disabled=true)= 'Selected + disabled'
             br
             br
             +button(pill=true quiet=true)= 'Idle'
@@ -133,13 +133,13 @@ mixin view-button
                 +button(theme=theme selected=true disabled=true)= 'Selected + disabled'
                 br
                 br
-                +button(theme=theme static=true)= 'Idle'
+                +button(theme=theme badge=true)= 'Idle'
                 = ' '
-                +button(theme=theme static=true selected=true)= 'Selected'
+                +button(theme=theme badge=true selected=true)= 'Selected'
                 = ' '
-                +button(theme=theme static=true disabled=true)= 'Disabled'
+                +button(theme=theme badge=true disabled=true)= 'Disabled'
                 = ' '
-                +button(theme=theme static=true selected=true disabled=true)= 'Selected + disabled'
+                +button(theme=theme badge=true selected=true disabled=true)= 'Selected + disabled'
                 br
                 br
                 +button(theme=theme quiet=true)= 'Idle'
@@ -164,13 +164,13 @@ mixin view-button
                 +button(theme=theme selected=true disabled=true)= 'Selected + disabled'
                 br
                 br
-                +button(theme=theme static=true)= 'Idle'
+                +button(theme=theme badge=true)= 'Idle'
                 = ' '
-                +button(theme=theme static=true selected=true)= 'Selected'
+                +button(theme=theme badge=true selected=true)= 'Selected'
                 = ' '
-                +button(theme=theme static=true disabled=true)= 'Disabled'
+                +button(theme=theme badge=true disabled=true)= 'Disabled'
                 = ' '
-                +button(theme=theme static=true selected=true disabled=true)= 'Selected + disabled'
+                +button(theme=theme badge=true selected=true disabled=true)= 'Selected + disabled'
                 br
                 br
                 +button(theme=theme quiet=true)= 'Idle'
diff --git a/tpl/views/card.pug b/tpl/views/card.pug
index f030abf..e982925 100644
--- a/tpl/views/card.pug
+++ b/tpl/views/card.pug
@@ -83,17 +83,17 @@ mixin view-card
                 +card-body
                     .l-media
                         .l-media__block
-                            +button(theme='positive' static=true pill=true size='sm' icon='repeat' href='#')
+                            +button(theme='positive' badge=true pill=true size='sm' icon='repeat' href='#')
                                 strong= '12'
                         .l-media__block
-                            +button(theme='warning' static=true pill=true size='sm' icon='star' href='#')
+                            +button(theme='warning' badge=true pill=true size='sm' icon='star' href='#')
                                 strong= '34'
                         .l-media__block.u-mis-auto
                             +button(selected=true)= 'Reply'
 
             +card(quiet=true href='#' class='l-card-list__card')
                 +card-image(src='Drawing_Half.png' style={ 'aspect-ratio': '21 / 9' })
-                    +button(badge=true static=true selected=true)= 'Drawings'
+                    +button(badge=true selected=true)= 'Drawings'
                 +card-body
                     +card-title= 'XS Heading'
                     +card-content