From: RafiBomb Date: Mon, 7 Mar 2016 23:59:37 +0000 (-0800) Subject: fixes h6 header color X-Git-Tag: v2.0.0-rc.3~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcbcad3901a35cffea1151d42a5fd457dfbeef56;p=thirdparty%2Ffoundation%2Ffoundation-emails.git fixes h6 header color --- diff --git a/scss/_global.scss b/scss/_global.scss index a2ebb30c..f7ba60b8 100755 --- a/scss/_global.scss +++ b/scss/_global.scss @@ -64,7 +64,7 @@ $body-background: $light-gray !default; /// Color for the container background /// @type Color -$container-background-color: $white !default; +$container-background: $white !default; /// Global font color. /// @type Color diff --git a/scss/components/_type.scss b/scss/components/_type.scss index 60cdb379..41a8c301 100755 --- a/scss/components/_type.scss +++ b/scss/components/_type.scss @@ -165,7 +165,7 @@ h3, h4, h5, h6 { - header: $header-color; + color: $header-color; word-break: normal; font-family: $header-font-family; Margin-bottom: $header-margin-bottom; @@ -252,7 +252,7 @@ h4 a, h4 a:visited, h5 a, h5 a:visited, -h6, +h6 a, h6 a:visited { color: $anchor-color; } diff --git a/testing/gulpfile.babel.js b/testing/gulpfile.babel.js index 535f8577..67c54198 100644 --- a/testing/gulpfile.babel.js +++ b/testing/gulpfile.babel.js @@ -109,7 +109,7 @@ function inliner(options) { } }) .pipe($.htmlmin, { - collapseWhitespace: false, + collapseWhitespace: true, minifyCSS: true }); diff --git a/testing/src/assets/scss/app.scss b/testing/src/assets/scss/app.scss index 78e107f0..ae721c36 100644 --- a/testing/src/assets/scss/app.scss +++ b/testing/src/assets/scss/app.scss @@ -23,4 +23,4 @@ display: block !important; } } -} +} \ No newline at end of file diff --git a/testing/src/layouts/default.html b/testing/src/layouts/default.html index b45143c8..01289e5c 100644 --- a/testing/src/layouts/default.html +++ b/testing/src/layouts/default.html @@ -1,9 +1,9 @@ - - + + - + diff --git a/testing/src/pages/kitcat.html b/testing/src/pages/kitcat.html index 0cf0a9bf..bbacf0c9 100644 --- a/testing/src/pages/kitcat.html +++ b/testing/src/pages/kitcat.html @@ -29,9 +29,7 @@

reader's choice award

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, - quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo - consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse - cillum dolore eu fugiat nulla pariatur.

+ quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.