Don't output vertical rhythm on h1 by default. #88

JohnAlbin · Oct 24, 2016 · a3e5051 · a3e5051
1 parent 6dcf294
commit a3e5051
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 20 deletions.
diff --git a/fork-versions/default/_normalize.scss b/fork-versions/default/_normalize.scss
@@ -79,8 +79,13 @@ h1 {
     @include normalize-line-height($h1-font-size);
   }
 
-  /* Set 1 unit of vertical rhythm on the top and bottom margins. */
-  @include normalize-margin(1 0, $h1-font-size);
+  @if $normalize-vertical-rhythm {
+    /* Set 1 unit of vertical rhythm on the top and bottom margins. */
+    @include normalize-margin(1 0, $h1-font-size);
+  }
+  @else {
+    margin: 0.67em 0;
+  }
 }
 
 @if $normalize-vertical-rhythm {

diff --git a/sass/normalize/_normalize-mixin.scss b/sass/normalize/_normalize-mixin.scss
@@ -108,8 +108,13 @@
         @include normalize-line-height($h1-font-size);
       }
 
-      /* Set 1 unit of vertical rhythm on the top and bottom margins. */
-      @include normalize-margin(1 0, $h1-font-size);
+      @if $normalize-vertical-rhythm {
+        /* Set 1 unit of vertical rhythm on the top and bottom margins. */
+        @include normalize-margin(1 0, $h1-font-size);
+      }
+      @else {
+        margin: 0.67em 0;
+      }
     }
 
     @if $normalize-vertical-rhythm {

diff --git a/test/fixtures/fork-versions/default/output.css b/test/fixtures/fork-versions/default/output.css
@@ -42,8 +42,7 @@ section {
  */
 h1 {
   font-size: 2em;
-  /* Set 1 unit of vertical rhythm on the top and bottom margins. */
-  margin: 0.75em 0; }
+  margin: 0.67em 0; }
 
 /* Grouping content
    ========================================================================== */

diff --git a/test/fixtures/import-now/output.css b/test/fixtures/import-now/output.css
@@ -42,8 +42,7 @@ section {
      */
 h1 {
   font-size: 2em;
-  /* Set 1 unit of vertical rhythm on the top and bottom margins. */
-  margin: 0.75em 0; }
+  margin: 0.67em 0; }
 
 /* Grouping content
        ========================================================================== */

diff --git a/test/fixtures/normalize/exclude-multiple/output.css b/test/fixtures/normalize/exclude-multiple/output.css
@@ -42,8 +42,7 @@ section {
      */
 h1 {
   font-size: 2em;
-  /* Set 1 unit of vertical rhythm on the top and bottom margins. */
-  margin: 0.75em 0; }
+  margin: 0.67em 0; }
 
 /* Links
        ========================================================================== */

diff --git a/test/fixtures/normalize/exclude-single/output.css b/test/fixtures/normalize/exclude-single/output.css
@@ -42,8 +42,7 @@ section {
      */
 h1 {
   font-size: 2em;
-  /* Set 1 unit of vertical rhythm on the top and bottom margins. */
-  margin: 0.75em 0; }
+  margin: 0.67em 0; }
 
 /* Grouping content
        ========================================================================== */

diff --git a/test/fixtures/normalize/exclude-string/output.css b/test/fixtures/normalize/exclude-string/output.css
@@ -42,8 +42,7 @@ section {
      */
 h1 {
   font-size: 2em;
-  /* Set 1 unit of vertical rhythm on the top and bottom margins. */
-  margin: 0.75em 0; }
+  margin: 0.67em 0; }
 
 /* Grouping content
        ========================================================================== */

diff --git a/test/fixtures/normalize/include-multiple/output.css b/test/fixtures/normalize/include-multiple/output.css
@@ -42,5 +42,4 @@ section {
      */
 h1 {
   font-size: 2em;
-  /* Set 1 unit of vertical rhythm on the top and bottom margins. */
-  margin: 0.75em 0; }
+  margin: 0.67em 0; }
diff --git a/test/fixtures/variables/default/output.css b/test/fixtures/variables/default/output.css
@@ -42,8 +42,7 @@ section {
      */
 h1 {
   font-size: 2em;
-  /* Set 1 unit of vertical rhythm on the top and bottom margins. */
-  margin: 0.75em 0; }
+  margin: 0.67em 0; }
 
 /* Grouping content
        ========================================================================== */

diff --git a/test/fixtures/variables/indent-amount/output.css b/test/fixtures/variables/indent-amount/output.css
@@ -42,8 +42,7 @@ section {
      */
 h1 {
   font-size: 2em;
-  /* Set 1 unit of vertical rhythm on the top and bottom margins. */
-  margin: 0.75em 0; }
+  margin: 0.67em 0; }
 
 /* Grouping content
        ========================================================================== */