]> git.ipfire.org Git - thirdparty/foundation/foundation-emails.git/commitdiff
projects / thirdparty / foundation / foundation-emails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7139a15)
fixes h6 header color
authorRafiBomb <rafi@zurb.com>
Mon, 7 Mar 2016 23:59:37 +0000 (15:59 -0800)
committerRafiBomb <rafi@zurb.com>
Mon, 7 Mar 2016 23:59:37 +0000 (15:59 -0800)
scss/_global.scss patch | blob | blame | history
scss/components/_type.scss patch | blob | blame | history
testing/gulpfile.babel.js patch | blob | blame | history
testing/src/assets/scss/app.scss patch | blob | blame | history
testing/src/layouts/default.html patch | blob | blame | history
testing/src/pages/kitcat.html patch | blob | blame | history

diff --git a/scss/_global.scss b/scss/_global.scss
index a2ebb30c0aa70bdbe0051e1499fd1bf58d9eac84..f7ba60b8d39a85966bf2d8dae89a748e450971a1 100755 (executable)
--- 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 60cdb3791132d1d468e5978bcd77db2da72058bf..41a8c3015d32ba38c02f847f7f755eda277689b2 100755 (executable)
--- 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 535f857761b7b3b0628f72fba4c52168a8f6fa63..67c54198214747afc31f2055cf71ab9b7b4631ee 100644 (file)
--- 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 78e107f03dbe869a4ce606a576e8a941de02dd92..ae721c36842cb94aa64872dc466e8b3f9a8b08bc 100644 (file)
--- 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 b45143c8ea14d59d291c0abf47fe31b59fa19fe1..01289e5cb86b2d29bc957e98373c3871dbbc021f 100644 (file)
--- a/testing/src/layouts/default.html
+++ b/testing/src/layouts/default.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html>
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-  <link rel="stylesheet" type="text/css" href="css/app.css">
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="viewport" content="width=device-width"/>
+  <link rel="stylesheet" type="text/css" href="css/app.css">
   <!-- inject:css -->
   <!-- endinject -->
 </head>
diff --git a/testing/src/pages/kitcat.html b/testing/src/pages/kitcat.html
index 0cf0a9bf918c428b6833eea71e716b73b7619d7a..bbacf0c98ce8ca2dcd79f3378bb64dcd6cd0f045 100644 (file)
--- a/testing/src/pages/kitcat.html
+++ b/testing/src/pages/kitcat.html
@@ -29,9 +29,7 @@
     <columns small="12" large="12">
       <h4 class="text-center">reader's choice award</h4>
       <p class="text-center">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.</p>
+      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.</p>
       <center>
         <button class="primary small" href="http://zurb.com">Find out more</button>
       </center>
Mirror of https://github.com/foundation/foundation-emails.git