6 files changed, 77 insertions, 14 deletions

diff --git a/tpl/objects/action-button.pug b/tpl/objects/action-button.pug
index c3a9b53..e9b6fe3 100644
--- a/tpl/objects/action-button.pug
+++ b/tpl/objects/action-button.pug
@@ -26,4 +26,9 @@ mixin action-button
         if attributes.icon
             +icon(attributes.icon)
             = ' '
-        block
+        if block
+            span.o-action-button__label
+                block
+        if attributes.postIcon
+            = ' '
+            +icon(attributes.postIcon)
diff --git a/tpl/objects/backdrop.pug b/tpl/objects/backdrop.pug
index 227700c..f577961 100644
--- a/tpl/objects/backdrop.pug
+++ b/tpl/objects/backdrop.pug
@@ -8,7 +8,10 @@ mixin backdrop
             classes[attributes.class] = true;
         }
 
-        let styles = { width: '100%', 'min-height': '5em', 'max-height': '40em' }
+        let styles = { width: '100%', 'min-height': '5em' }
+        if (attributes.maxHeight) {
+            styles['max-height'] = '40em';
+        }
         if (attributes.pad) {
             styles['padding'] = '2em';
         }
diff --git a/tpl/objects/card.pug b/tpl/objects/card.pug
index 2ab9bef..e0f6a15 100644
--- a/tpl/objects/card.pug
+++ b/tpl/objects/card.pug
@@ -26,7 +26,16 @@ mixin card-image
             classes[attributes.class] = true;
         }
 
-    img(class=classes src=attributes.src style=attributes.style)
+        let imgClasses = {
+            'o-card__image-img': true,
+            'l-card-list__card-image': attributes.list
+        }
+
+    div(class=classes)
+        img(class=imgClasses src=attributes.src style=attributes.style)
+        if block
+            .o-card__image-overlay 
+                block
 
 mixin card-body
     .o-card__body(style=attributes.style)
diff --git a/tpl/objects/divider.pug b/tpl/objects/divider.pug
index 46425cd..ed4d27a 100644
--- a/tpl/objects/divider.pug
+++ b/tpl/objects/divider.pug
@@ -3,6 +3,8 @@ mixin divider(level)
         let classes = {
             'o-divider':                        true,
             'o-divider--labelled':              !!block,
+            'o-divider--vertical':              !!attributes.vertical,
+            'o-divider--dot':                   !!attributes.dot,
             ['o-divider--' + level]:            true,
             ['o-divider--' + attributes.color]: !!attributes.color
         }
diff --git a/tpl/objects/lightbox.pug b/tpl/objects/lightbox.pug
index 02a3200..842d44a 100644
--- a/tpl/objects/lightbox.pug
+++ b/tpl/objects/lightbox.pug
@@ -4,14 +4,19 @@ mixin lightbox(images)
     -
         let classes = {
             'o-lightbox': true,
+            'o-lightbox--interactive': attributes.interactive,
         }
         let linksClasses = {
             's-links': true,
         }
+        let thumbnailClasses = {
+            'o-thumbnail': true,
+        }
 
         if (attributes.theme) {
             classes[`o-lightbox--${attributes.theme}`] = true;
             linksClasses[`s-links--${attributes.theme}`] = true;
+            thumbnailClasses[`o-thumbnail--${attributes.theme}`] = true;
         }
 
     div(class=classes)
@@ -19,21 +24,23 @@ mixin lightbox(images)
             div(class=linksClasses)
                 block
             +action-button(theme=attributes.theme pill=true quiet=true icon='x' class='o-lightbox__close-btn')
+
         each img, i in images
-            img.o-lightbox__img(src=images[i] id='image-' + i)
-            +action-button(theme=attributes.theme pill=true quiet=true icon='chevron-left' class='o-lightbox__nav-btn o-lightbox__nav-btn--prev')
-            +action-button(theme=attributes.theme pill=true quiet=true icon='chevron-right' class='o-lightbox__nav-btn o-lightbox__nav-btn--next')
+            img(src=images[i] id=('image-' + i) class=`o-lightbox__img ${attributes.interactive && !i ? 'is-visible' : ''}`)
 
-        img.o-lightbox__img.o-lightbox__img--default(src=images[0])
         if images.length > 1
             +action-button(theme=attributes.theme pill=true quiet=true icon='chevron-left' class='o-lightbox__nav-btn o-lightbox__nav-btn--prev')
             +action-button(theme=attributes.theme pill=true quiet=true icon='chevron-right' class='o-lightbox__nav-btn o-lightbox__nav-btn--next')
+
         .o-lightbox__thumbnails
             each img, i in images
-                - classes = i === 0 ? 'is-selected' : ''
-                a.o-lightbox__thumbnail(class=classes href='#image-' + i)
-                    img.o-lightbox__thumbnail-img(src=img)
-            button.o-lightbox__thumbnail
-                +icon('volume-2')(class='o-lightbox__thumbnail-icon')
-            button.o-lightbox__thumbnail
-                +icon('video')(class='o-lightbox__thumbnail-icon')
+                -
+                    let classes = { 'is-selected': i === 0 }
+                    Object.assign(classes, thumbnailClasses)
+
+                a.o-thumbnail(class=classes href='#image-' + i)
+                    img.o-thumbnail__image(src=img)
+            button(class=thumbnailClasses)
+                +icon('volume-2')(class='o-thumbnail__icon')
+            button(class=thumbnailClasses)
+                +icon('video')(class='o-thumbnail__icon')
diff --git a/tpl/objects/navbar.pug b/tpl/objects/navbar.pug
new file mode 100644
index 0000000..5c7642c
--- /dev/null
+++ b/tpl/objects/navbar.pug
@@ -0,0 +1,37 @@
+include icon.pug
+include status-indicator.pug
+include action-button.pug
+
+mixin navbar
+    -
+        let classes = {
+            'o-navbar': true,
+            'o-navbar--quiet': attributes.quiet,
+        }
+        if (attributes.class) {
+            classes[attributes.class] = true;
+        }
+
+    div(class=classes)&attributes(attributes)
+        block
+
+mixin navbar-item
+    -
+        let classes = {
+            'o-navbar__item': true,
+            'is-selected':    attributes.selected,
+        }
+        if (attributes.class) {
+            classes[attributes.class] = true;
+        }
+
+    #{!!attributes.tag ? attributes.tag : 'button'}(class=classes)&attributes(attributes)
+        .o-navbar__item-content
+            if attributes.icon
+                +icon(attributes.icon)
+                = ' '
+            span.o-navbar__item-content-text
+                block
+            if attributes.postIcon
+                = ' '
+                +icon(attributes.postIcon)