]> 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 | combined (merge: 83b6bb9 a1b5975)
Merge branch 'develop' into v2.2
authorRafiBomb <rafi@zurb.com>
Thu, 30 Jun 2016 20:12:57 +0000 (13:12 -0700)
committerRafiBomb <rafi@zurb.com>
Thu, 30 Jun 2016 20:12:57 +0000 (13:12 -0700)
1  2 
README.md patch | diff1 | diff2 | blob | history
bower.json patch | diff1 | diff2 | blob | history
dist/foundation-emails.css patch | diff1 | diff2 | blob | history
docs/pages/css-guide.md patch | diff1 | diff2 | blob | history
gulpfile.js patch | diff1 | diff2 | blob | history

diff --cc README.md
Simple merge
diff --cc bower.json
Simple merge
diff --cc dist/foundation-emails.css
index b5bc536e6ac1028500705e027b898b5b0e30e1ea,acd1b982794a6df76a5d9d9780c1a07c9fbdbf7c..eddd2a846ff12bdca59b0b82e1356bb9d6f858e8
mode 100644,100755..100644
--- 1/dist/foundation-emails.css
--- 2/dist/foundation.css
+++ b/dist/foundation-emails.css
@@@ -748,7 -782,7 +783,6 @@@ th.float-center 
    overflow: hidden;
    max-height: 0;
    font-size: 0;
--  width: 0;
    line-height: 0; }
    @media only screen and (max-width: 596px) {
      .hide-for-large {
diff --cc docs/pages/css-guide.md
index 93368a707e8587898293ef30fd0c6d42ef78d3d3,3e41639efb069b404daa4da4c351b17e7ad5f23f..6bbd41fb527df23259d9ffd68654ab6fed36c83f
--- 1/docs/pages/css-guide.md
--- 2/docs/pages/css-guide.md
+++ b/docs/pages/css-guide.md
@@@ -42,10 -42,12 +42,12 @@@ Inside `index.html`, you can see the bo
  <head>
    <!-- The character set should be utf-8 -->
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-   <!-- Enables media queries -->
    <meta name="viewport" content="width=device-width"/>
    <!-- Link to the email's CSS, which will be inlined into the email -->
 -  <link rel="stylesheet" href="css/foundation.css">
 +  <link rel="stylesheet" href="assets/css/foundation-emails.css">
+   <style>
+     <!-- Your CSS to inline should be added here -->
+   </style>
  </head>
  
  <body>
diff --cc gulpfile.js
Simple merge
Mirror of https://github.com/foundation/foundation-emails.git