merge

TKirmani · Apr 19, 2017 · 3c4a790 · 3c4a790
2 parents 4a5ab12 + 8d2ca49
commit 3c4a790
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 33 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,9 +1,9 @@
-Copyright (c) 2016 ZURB, inc.
+Copyright (c) 2017 ZURB, inc.
 
 MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 [![downloads badge](https://img.shields.io/npm/dm/foundation-emails.svg)](https://www.npmjs.org/package/foundation-emails)
 [![Gem Version](https://badge.fury.io/rb/foundation_emails.svg)](https://badge.fury.io/rb/foundation_emails)
 [![downloads badge](https://img.shields.io/npm/l/foundation-emails.svg)](https://www.npmjs.org/package/foundation-emails)
+[![CDNJS](https://img.shields.io/cdnjs/v/foundation-emails.svg)](https://cdnjs.com/libraries/foundation-emails)
 
 
 Foundation for Emails (previously known as Ink) is a framework for creating responsive HTML emails that work in any email client &mdash; even Outlook. Our HTML/CSS components have been tested across every major email client to ensure consistency. And with the [Inky](https://github.com/zurb/inky) templating language, writing HTML emails is now even easier.
@@ -123,4 +124,4 @@ The parser converts a set of custom HTML tags, expanding them out into full HTML
 
 As an open source project, we looooove our community support. Please file issues, or better yet pull requests on the [Foundation for Emails Repo](https://github.com/zurb/foundation-emails). We're stoked to hear your feedback, make improvements, and keep evolving Foundation for Emails!
 
-Copyright (c) 2016 ZURB, inc.
+Copyright (c) 2017 ZURB, inc.
diff --git a/docs/pages/panini.md b/docs/pages/panini.md
@@ -177,7 +177,7 @@ If you don't see the right helper, you can write your own. Add a javascript file
 ```
 // Example file src/helpers/bold.js
 module.exports = function(options) {
-  // options.fn(this) = Handelbars content between {{#bold}} HERE {{/bold}}
+  // options.fn(this) = Handlebars content between {{#bold}} HERE {{/bold}}
   var bolder = '<strong>' + options.fn(this) + '</strong>';
   return bolder;
 }

diff --git a/docs/pages/sass-guide.md b/docs/pages/sass-guide.md
@@ -168,7 +168,7 @@ Now that you have an inlined email, you'll need to test it in real email clients
 
 The most popular tool for testing emails is [Litmus](https://litmus.com/). All you have to do is paste in the HTML of an email, and you get a live preview in any email client you want.
 
-It's up to you to choose what email clients are important to test in, but you can [see our compatability list](compatibility.html) for recommendations.
+It's up to you to choose what email clients are important to test in, but you can [see our compatibility list](compatibility.html) for recommendations.
 
 ---
 

diff --git a/docs/pages/tips-tricks.md b/docs/pages/tips-tricks.md
@@ -36,7 +36,7 @@ The height of your email doesn't matter as much because people scroll. It still
 
 #### Structure and alignment:
 
-When it comes to making emails, divs aren’t a thing. Don’t kill the messenger, but it’s true. It's not fun finding out we can't just use a `<div>` with auto left and right margins for centering, or background colors; It won't work most email clients. `<div>`'s can still be used for targeting CSS and for grouping semantically related elements, but shouldn’t be used for for structural purposes or spacing.
+When it comes to making emails, divs aren’t a thing. Don’t kill the messenger, but it’s true. It's not fun finding out we can't just use a `<div>` with auto left and right margins for centering, or background colors; It won't work most email clients. `<div>`'s can still be used for targeting CSS and for grouping semantically related elements, but shouldn’t be used for structural purposes or spacing.
 
 Instead, you can use the `<wrapper>` Inky tag to create background colors and target elements inside. [More on Wrapper &#8594;](wrapper.html)
 
@@ -113,7 +113,7 @@ Speaking of CSS, you should only set classes and IDs on tables or `<td>` tags, n
 Support of CSS properties varies greatly between email clients. You're best off sticking with the basics and not getting too fancy.
 
 This CSS compatibility chart will really save you some pain when writing CSS:
-[CSS Support Chart](https://www.campaignmonitor.com/css/b/)
+[CSS Support Chart](https://www.campaignmonitor.com/css/)
 
 <img src="assets/img/campaign-monitor-css-guide.jpg" alt="">
 

diff --git a/docs/pages/typography.md b/docs/pages/typography.md
@@ -1,7 +1,7 @@
 ---
 title: Typography
 description: Typography in Foundation for Emails is meant to make your life easier by providing clean, attractive, simple default styles for all of the most basic typographical elements.
-sass: scss/components/_type.scss
+sass: scss/components/_typography.scss
 ---
 
 ## Paragraphs

diff --git a/docs/pages/wrapper.md b/docs/pages/wrapper.md
@@ -1,6 +1,6 @@
 ---
 title: Wrapper
-description: Wrapper creates the necessary structure to wrap elements so that full width backgrounds can applied.
+description: Wrapper creates the necessary structure to wrap elements so that full width backgrounds can be applied.
 tags:
   - full width
   - fliud

diff --git a/gulpfile.js b/gulpfile.js
@@ -11,6 +11,7 @@ var inky = require('inky');
 var siphon = require('siphon-media-query');
 var lazypipe = require('lazypipe');
 var fs = require('fs');
+var yargs = require('yargs');
 
 // Configuration for the documentation generator
 supercollider
@@ -111,7 +112,8 @@ gulp.task('lint', function() {
 // Creates a BrowserSync server
 gulp.task('server', ['build'], function() {
   browser.init({
-    server: './_build'
+    server: './_build',
+    port: yargs.argv.port || 3001
   });
 });
 
@@ -215,7 +217,8 @@ function inliner(css) {
     .pipe($.injectString.replace, '<!-- <style> -->', '<style>'+mqCss+'</style>')
     .pipe($.htmlmin, {
       collapseWhitespace: false,
-      minifyCSS: false
+      minifyCSS: false,
+      maxLineLength: 800
     });
 
   return pipe();

diff --git a/package.json b/package.json
@@ -54,6 +54,7 @@
     "siphon-media-query": "^1.0.0",
     "supercollider": "^1.4.0",
     "typeahead.js": "^0.11.1",
+    "yargs": "^7.1.0",
     "zeroclipboard": "^2.2.0"
   },
   "license": "MIT",
@@ -63,5 +64,3 @@
     "needs": "^0.8.0"
   }
 }
-
-
diff --git a/scss/_global.scss b/scss/_global.scss
@@ -78,7 +78,7 @@ $global-padding: 16px !default;
 /// @type Number
 $global-margin: 16px !default;
 
-/// Global raidus of radius-corners.
+/// Global radius of radius-corners.
 /// @type Number
 $global-radius: 3px !default;
 

diff --git a/scss/components/_button.scss b/scss/components/_button.scss
@@ -145,7 +145,7 @@ table.button.large {
 
 table.button.expand,
 table.button.expanded {
-  width: 100% !important;
+  width: 100%;
 
   table {
     width: 100%;

diff --git a/scss/grid/_grid.scss b/scss/grid/_grid.scss
@@ -69,11 +69,17 @@ th.column {
   padding-bottom: $column-padding-bottom;
 
   // Prevents Nested columns from double the padding
-  .column,
-  .columns {
+  .column.first,
+  .columns.first {
     padding-left: 0 !important;
+  }
+  .column.last,
+  .columns.last {
     padding-right: 0 !important;
+  }
 
+  .column,
+  .columns {
     center {
       min-width: none !important;
     }

diff --git a/test/visual/pages/grid-nested-inky.html b/test/visual/pages/grid-nested-inky.html
@@ -23,7 +23,14 @@
           <p>nested 6 columns</p>
         </columns>
         <columns small="6" class="red">
-          <p>2sdafkhasdfkjhas dkfjh askdjfh askjdhf aksjdhf aksjdhf kajshdf</p>
+          <row>
+            <columns small="6" class="blue">
+              <p>nested 6 columns</p>
+            </columns>
+            <columns small="6" class="red">
+              <p>2sdafkhasdfkjhas dkfjh askdjfh askjdhf aksjdhf aksjdhf kajshdf</p>
+            </columns>
+          </row>
         </columns>
       </row>
 
@@ -35,16 +42,16 @@
 <container>
   <row>
     <columns small="12">
-      
+
       <row>
         <columns large="6">
-          
+
         </columns>
         <columns large="6">
-      
+
         </columns>
       </row>
-    
+
     </columns>
   </row>
-</container>
+</container>
diff --git a/test/visual/pages/inliner-bugs.html b/test/visual/pages/inliner-bugs.html
@@ -1,11 +1,11 @@
 <!-- <container>
   <row>
     <columns>
-      
+
       #417 - 2 sets of angle backets: outer set should not get converted to charachter codes. you should not see 2 angle brackets here:
       <br>
       <raw><<LCG Program\TG LCG Coupon Code Default='246996'>></raw>
-      confirmed on inliner (both) need to 
+      confirmed on inliner (both) need to
 
       <hr>
 
@@ -17,7 +17,7 @@
       Inky issue
 
       <hr>
-      mdash; should not be converted to #x2014; 
+      mdash; should not be converted to #x2014;
       <br>
       &mdash;
       <br>
@@ -27,7 +27,7 @@
 
       quotes should not be converted to quot;
       <br>
-      " 
+      "
       <br>
       Inky issue
       <hr>
@@ -67,19 +67,19 @@
       confirmed on web inliner only (inliner-v2)
 
       <hr>
-      
+
       #450 - & #xA0; should not be converted to & nbsp;
-      
+
       <table class="spacer">
         <tbody>
           <tr>
             <td height="16px" style="font-size:16px;line-height:16px;">&#xA0;</td>
           </tr>
         </tbody>
       </table>
-      
+
       Confirmed inliner-v2 issue issue.
-      
+
       <hr>
 
       #284 - @font-face should show up in HTML
@@ -93,8 +93,8 @@
       </style>
       <br>
       confirmed inliner issue
-      
+
     </columns>
   </row>
 </container>
- -->
+ -->