@brettmason's suggestion

diff --git a/scss/typography/_base.scss b/scss/typography/_base.scss
index 318db5d3158844d765844b47f1dd32bc75b3635c..f7ebaeed0221327e2070bb7879fc35af85349b61 100644 (file)
--- a/scss/typography/_base.scss
+++ b/scss/typography/_base.scss
@@ -309,16 +309,14 @@ $abbr-underline: 1px dotted $black !default;
   h4,
   h5,
   h6 {
-    margin-top: 0;
-    margin-bottom: $header-margin-bottom;
     font-family: $header-font-family;
     font-style: $header-font-style;
     font-weight: $header-font-weight;
-    line-height: $header-lineheight;
     color: $header-color;
     text-rendering: $header-text-rendering;
 
     small {
+      line-height: 0;
       color: $header-small-font-color;
     }
   }
@@ -336,26 +334,31 @@ $abbr-underline: 1px dotted $black !default;
           } @else if map-has-key($header-defs, fs) {
             $font-size-temp: rem-calc(map-get($header-defs, fs));
             font-size: $font-size-temp;
-          } 
-
+          } @else if $size == $-zf-zero-breakpoint {
+            font-size: $font-size-temp;
+          }
           @if map-has-key($header-defs, line-height) {
             line-height: unitless-calc(map-get($header-defs, line-height), $font-size-temp);
           } @else if map-has-key($header-defs, lh) {
             line-height: unitless-calc(map-get($header-defs, lh), $font-size-temp);
-          } 
+          } @else if $size == $-zf-zero-breakpoint {
+            line-height: unitless-calc($header-lineheight, $font-size-temp);
+          }
 
           @if map-has-key($header-defs, margin-top) {
             margin-top: rem-calc(map-get($header-defs, margin-top));
           } @else if map-has-key($header-defs, mt) {
             margin-top: rem-calc(map-get($header-defs, mt));
-          } 
-
+          } @else if $size == $-zf-zero-breakpoint {
+            margin-top: 0;
+          }
           @if map-has-key($header-defs, margin-bottom) {
             margin-bottom: rem-calc(map-get($header-defs, margin-bottom));
           } @else if map-has-key($header-defs, mb) {
             margin-bottom: rem-calc(map-get($header-defs, mb));
-          } 
-
+          } @else if $size == $-zf-zero-breakpoint {
+            margin-bottom: rem-calc($header-margin-bottom);
+          }
         }
       }
     }