2 files changed, 34 insertions, 26 deletions

diff --git a/tpl/objects/heading.pug b/tpl/objects/heading.pug
index 47ffefa..6cc05ad 100644
--- a/tpl/objects/heading.pug
+++ b/tpl/objects/heading.pug
@@ -1,42 +1,34 @@
-mixin h1-heading(level, inner = false)
-    - let classes = ['o-heading', 'o-heading--' + level]
+mixin h1-heading(level, display = false)
+    - let classes = ['o-heading', 'o-heading--' + level, { 'o-heading--display': display }]
     h1(class=classes)&attributes(attributes)
-        if inner
-            span.o-heading__inner
-                block
-        else
-            block
+        block
 
-mixin h2-heading(level)
-    - let classes = ['o-heading', 'o-heading--' + level]
+mixin h2-heading(level, display = false)
+    - let classes = ['o-heading', 'o-heading--' + level, { 'o-heading--display': display }]
     h2(class=classes)&attributes(attributes)
         block
 
-mixin h3-heading(level)
-    - let classes = ['o-heading', 'o-heading--' + level]
+mixin h3-heading(level, display = false)
+    - let classes = ['o-heading', 'o-heading--' + level, { 'o-heading--display': display }]
     h3(class=classes)&attributes(attributes)
         block
 
-mixin h4-heading(level)
-    - let classes = ['o-heading', 'o-heading--' + level]
+mixin h4-heading(level, display = false)
+    - let classes = ['o-heading', 'o-heading--' + level, { 'o-heading--display': display }]
     h4(class=classes)&attributes(attributes)
         block
 
-mixin h5-heading(level)
-    - let classes = ['o-heading', 'o-heading--' + level]
+mixin h5-heading(level, display = false)
+    - let classes = ['o-heading', 'o-heading--' + level, { 'o-heading--display': display }]
     h5(class=classes)&attributes(attributes)
         block
 
-mixin h6-heading(level)
-    - let classes = ['o-heading', 'o-heading--' + level]
+mixin h6-heading(level, display = false)
+    - let classes = ['o-heading', 'o-heading--' + level, { 'o-heading--display': display }]
     h6(class=classes)&attributes(attributes)
         block
 
-mixin div-heading(level, primary = false)
-    - let classes = ['o-heading', 'o-heading--' + level]
+mixin div-heading(level, display = false)
+    - let classes = ['o-heading', 'o-heading--' + level, { 'o-heading--display': display }]
     div(class=classes)&attributes(attributes)
-        if primary
-            span.o-heading__primary
-                block
-        else
-            block
+        block
diff --git a/tpl/views/heading.pug b/tpl/views/heading.pug
index 07080d5..bc16cee 100644
--- a/tpl/views/heading.pug
+++ b/tpl/views/heading.pug
@@ -9,17 +9,33 @@ mixin view-heading
             h6= 'H6 default'
 
         .c-box.s-headings
-            h1.u-mt-0: span.s-headings__primary= 'H1 styled'
+            h1.u-mt-0= 'H1 styled'
             h2= 'H2 styled'
             h3= 'H3 styled'
             h4= 'H4 styled'
             h5= 'H5 styled'
             h6= 'H6 styled'
 
+        .c-box.s-headings.s-headings--display
+            h1.u-mt-0= 'H1 display styled'
+            h2= 'H2 display styled'
+            h3= 'H3 display styled'
+            h4= 'H4 display styled'
+            h5= 'H5 display styled'
+            h6= 'H6 display styled'
+
         .c-box
-            +div-heading('xxl', true)(class='u-mt-0')= 'XXL Heading'
+            +div-heading('xxl')(class='u-mt-0')= 'XXL Heading'
             +div-heading('xl')= 'XL Heading'
             +div-heading('lg')= 'LG Heading'
             +div-heading('md')= 'MD Heading'
             +div-heading('sm')= 'SM Heading'
             +div-heading('xs')= 'XS Heading'
+
+        .c-box
+            +div-heading('xxl', true)(class='u-mt-0')= 'XXL display Heading'
+            +div-heading('xl', true)= 'XL display Heading'
+            +div-heading('lg', true)= 'LG display Heading'
+            +div-heading('md', true)= 'MD display Heading'
+            +div-heading('sm', true)= 'SM display Heading'
+            +div-heading('xs', true)= 'XS display Heading'