Re-order

Put `font-size` and `line-height` first.

diff --git a/scss/typography/_base.scss b/scss/typography/_base.scss
index aba1bb650921fbec5a96b8f380ece102dcc0258a..318db5d3158844d765844b47f1dd32bc75b3635c 100644 (file)
--- a/scss/typography/_base.scss
+++ b/scss/typography/_base.scss
@@ -330,19 +330,6 @@ $abbr-underline: 1px dotted $black !default;
         $font-size-temp: 1rem;
         #{$header} {
 
-          @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));
-          } 
-
-          @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));
-          } 
-
-
           @if map-has-key($header-defs, font-size) {
             $font-size-temp: rem-calc(map-get($header-defs, font-size));
             font-size: $font-size-temp;
@@ -357,6 +344,18 @@ $abbr-underline: 1px dotted $black !default;
             line-height: unitless-calc(map-get($header-defs, lh), $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));
+          } 
+
+          @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));
+          } 
+
         }
       }
     }