4 files changed, 27 insertions, 1 deletions

diff --git a/tpl/objects/button.pug b/tpl/objects/button.pug
index c356bfe..3b5de2b 100644
--- a/tpl/objects/button.pug
+++ b/tpl/objects/button.pug
@@ -11,6 +11,7 @@ mixin button
             'o-button--badge':     attributes.badge,
             'o-button--icon':      !!attributes.icon && !block,
             'is-selected':         attributes.selected,
+            'is-highlighted':      attributes.highlighted,
         }
         if (attributes.theme) {
             classes['o-button--' + attributes.theme] = true
diff --git a/tpl/objects/field-label.pug b/tpl/objects/field-label.pug
index fb96443..192780d 100644
--- a/tpl/objects/field-label.pug
+++ b/tpl/objects/field-label.pug
@@ -16,7 +16,7 @@ mixin field-label(label, hint=null)
 
         let labelStyle = needsLabelWidth ? 'width: ' + attributes.labelWidth : '';
 
-    div(class=classes)
+    label(class=classes)
         .o-field-label__label(style=labelStyle class=attributes.labelClass)= label
         .o-field-label__content(class=attributes.contentClass)
             block
diff --git a/tpl/objects/text-field.pug b/tpl/objects/text-field.pug
index 0342f01..6de30e9 100644
--- a/tpl/objects/text-field.pug
+++ b/tpl/objects/text-field.pug
@@ -12,6 +12,7 @@ mixin text-field
         let classes = {
             'o-text-field':           true,
             'o-text-field--extended': !!block,
+            'o-text-field--pill':     attributes.pill,
             'is-invalid':             attributes.invalid,
             'is-disabled':            attributes.disabled,
             'l-media':                !!block,
diff --git a/tpl/views/button.pug b/tpl/views/button.pug
index 2e54458..4b8c59f 100644
--- a/tpl/views/button.pug
+++ b/tpl/views/button.pug
@@ -71,6 +71,8 @@ mixin view-button
         .c-box
             +button= 'Idle'
             = ' '
+            +button(highlighted=true)= 'Highlighted'
+            = ' '
             +button(selected=true)= 'Selected'
             = ' '
             +button(disabled=true)= 'Disabled'
@@ -80,6 +82,8 @@ mixin view-button
             br
             +button(badge=true)= 'Idle'
             = ' '
+            +button(badge=true highlighted=true)= 'Highlighted'
+            = ' '
             +button(badge=true selected=true)= 'Selected'
             = ' '
             +button(badge=true disabled=true)= 'Disabled'
@@ -89,6 +93,8 @@ mixin view-button
             br
             +button(quiet=true)= 'Idle'
             = ' '
+            +button(quiet=true highlighted=true)= 'Highlighted'
+            = ' '
             +button(quiet=true selected=true)= 'Selected'
             = ' '
             +button(quiet=true disabled=true)= 'Disabled'
@@ -98,6 +104,8 @@ mixin view-button
         .c-box
             +button(pill=true)= 'Idle'
             = ' '
+            +button(pill=true highlighted=true)= 'Highlighted'
+            = ' '
             +button(pill=true selected=true)= 'Selected'
             = ' '
             +button(pill=true disabled=true)= 'Disabled'
@@ -107,6 +115,8 @@ mixin view-button
             br
             +button(pill=true badge=true)= 'Idle'
             = ' '
+            +button(pill=true badge=true highlighted=true)= 'Highlighted'
+            = ' '
             +button(pill=true badge=true selected=true)= 'Selected'
             = ' '
             +button(pill=true badge=true disabled=true)= 'Disabled'
@@ -116,6 +126,8 @@ mixin view-button
             br
             +button(pill=true quiet=true)= 'Idle'
             = ' '
+            +button(pill=true quiet=true highlighted=true)= 'Highlighted'
+            = ' '
             +button(pill=true quiet=true selected=true)= 'Selected'
             = ' '
             +button(pill=true quiet=true disabled=true)= 'Disabled'
@@ -126,6 +138,8 @@ mixin view-button
             .c-box
                 +button(theme=theme)= 'Idle'
                 = ' '
+                +button(theme=theme highlighted=true)= 'Highlighted'
+                = ' '
                 +button(theme=theme selected=true)= 'Selected'
                 = ' '
                 +button(theme=theme disabled=true)= 'Disabled'
@@ -135,6 +149,8 @@ mixin view-button
                 br
                 +button(theme=theme badge=true)= 'Idle'
                 = ' '
+                +button(theme=theme badge=true highlighted=true)= 'Highlighted'
+                = ' '
                 +button(theme=theme badge=true selected=true)= 'Selected'
                 = ' '
                 +button(theme=theme badge=true disabled=true)= 'Disabled'
@@ -144,6 +160,8 @@ mixin view-button
                 br
                 +button(theme=theme quiet=true)= 'Idle'
                 = ' '
+                +button(theme=theme quiet=true highlighted=true)= 'Highlighted'
+                = ' '
                 +button(theme=theme quiet=true selected=true)= 'Selected'
                 = ' '
                 +button(theme=theme quiet=true disabled=true)= 'Disabled'
@@ -157,6 +175,8 @@ mixin view-button
             .c-box(style=`background-color: var(--colors--blue-static--${bg});`)
                 +button(theme=theme)= 'Idle'
                 = ' '
+                +button(theme=theme highlighted=true)= 'Highlighted'
+                = ' '
                 +button(theme=theme selected=true)= 'Selected'
                 = ' '
                 +button(theme=theme disabled=true)= 'Disabled'
@@ -166,6 +186,8 @@ mixin view-button
                 br
                 +button(theme=theme badge=true)= 'Idle'
                 = ' '
+                +button(theme=theme badge=true highlighted=true)= 'Highlighted'
+                = ' '
                 +button(theme=theme badge=true selected=true)= 'Selected'
                 = ' '
                 +button(theme=theme badge=true disabled=true)= 'Disabled'
@@ -175,6 +197,8 @@ mixin view-button
                 br
                 +button(theme=theme quiet=true)= 'Idle'
                 = ' '
+                +button(theme=theme quiet=true highlighted=true)= 'Highlighted'
+                = ' '
                 +button(theme=theme quiet=true selected=true)= 'Selected'
                 = ' '
                 +button(theme=theme quiet=true disabled=true)= 'Disabled'