diff options
author | JohnAlbin <virtually.johnalbin@gmail.com> | 2016-10-24 09:17:17 +0300 |
---|---|---|
committer | JohnAlbin <virtually.johnalbin@gmail.com> | 2016-10-24 09:24:13 +0300 |
commit | a3e5051290ddc889f1dfcd30e35730b017a506ca (patch) | |
tree | 8fa173dc06ee4bc40c8584185a60793b53da534a | |
parent | 6dcf2941f392560414d0f7ebcc4df60b51976d5e (diff) |
Don't output vertical rhythm on h1 by default. #88
-rw-r--r-- | fork-versions/default/_normalize.scss | 9 | ||||
-rw-r--r-- | sass/normalize/_normalize-mixin.scss | 9 | ||||
-rw-r--r-- | test/fixtures/fork-versions/default/output.css | 3 | ||||
-rw-r--r-- | test/fixtures/import-now/output.css | 3 | ||||
-rw-r--r-- | test/fixtures/normalize/exclude-multiple/output.css | 3 | ||||
-rw-r--r-- | test/fixtures/normalize/exclude-single/output.css | 3 | ||||
-rw-r--r-- | test/fixtures/normalize/exclude-string/output.css | 3 | ||||
-rw-r--r-- | test/fixtures/normalize/include-multiple/output.css | 3 | ||||
-rw-r--r-- | test/fixtures/variables/default/output.css | 3 | ||||
-rw-r--r-- | test/fixtures/variables/indent-amount/output.css | 3 |
10 files changed, 22 insertions, 20 deletions
diff --git a/fork-versions/default/_normalize.scss b/fork-versions/default/_normalize.scss index 2eb3e92..23f383f 100644 --- 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 index 33a381e..0166670 100644 --- 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 index dda3b63..047e693 100644 --- 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 index 2a37664..14897bb 100644 --- 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 index bfc7a9e..bc3db2d 100644 --- 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 index ce75668..0034bcb 100644 --- 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 index 7b77e43..63e262d 100644 --- 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 index b730126..b4008de 100644 --- 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 index 2a37664..14897bb 100644 --- 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 index 6e7a201..acbdb96 100644 --- 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 ========================================================================== */ |