From: RafiBomb <rafi@zurb.com>
Date: Wed, 16 Mar 2016 16:43:56 +0000 (-0700)
Subject: fix for collapse cascading to nested grids
X-Git-Tag: v2.0.0-rc.4~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=333300c771d22855549bae6a72f91044347cded5;p=thirdparty%2Ffoundation%2Ffoundation-emails.git

fix for collapse cascading to nested grids
---

diff --git a/scss/components/_normalize.scss b/scss/components/_normalize.scss
index 34cdc3e5..285e3102 100755
--- a/scss/components/_normalize.scss
+++ b/scss/components/_normalize.scss
@@ -52,7 +52,6 @@ img {
   -ms-interpolation-mode: bicubic;
   width: auto;
   max-width: 100%;
-  float: left;
   clear: both;
   display: block;
 }
@@ -77,7 +76,7 @@ table {
 }
 
 td {
-  word-break: break-word;
+  word-wrap: break-word;
   -webkit-hyphens: auto;
   -moz-hyphens: auto;
   hyphens: auto;
diff --git a/scss/grid/_grid.scss b/scss/grid/_grid.scss
index e5a760b7..3c752748 100755
--- a/scss/grid/_grid.scss
+++ b/scss/grid/_grid.scss
@@ -93,8 +93,8 @@ th.column {
 
   //Collapsed logic
   .collapse {
-    td.large-#{$i},
-    th.large-#{$i} {
+    > td.large-#{$i},
+    > th.large-#{$i} {
       padding-right: 0;
       padding-left: 0;
       width: -zf-grid-calc-px($i, $grid-column-count, $global-width) + $global-gutter;