Fixed and improved nav bar to support labels

1 files changed, 9 insertions, 3 deletions

diff --git a/tpl/objects/navbar.pug b/tpl/objects/navbar.pug
index 14ec9d3..28c7107 100644
--- a/tpl/objects/navbar.pug
+++ b/tpl/objects/navbar.pug
@@ -26,12 +26,18 @@ mixin navbar-item
         }
 
     #{!!attributes.tag ? attributes.tag : 'button'}(class=classes)&attributes(attributes)
+        if attributes.icon
+            .o-navbar__item-label
+                block
         .o-navbar__item-content
+            if attributes.preIcon
+                +icon(attributes.preIcon)
+                = ' '
             if attributes.icon
                 +icon(attributes.icon)
-                = ' '
-            span.o-navbar__item-content-text
-                block
+            else
+                span.o-navbar__item-content-text
+                    block
             if attributes.postIcon
                 = ' '
                 +icon(attributes.postIcon)