fix for collapse cascading to nested grids

diff --git a/scss/components/_normalize.scss b/scss/components/_normalize.scss
index 34cdc3e57772fbf3d7ef2e3ed5b86c4fc31323c9..285e31026f9ec0acf2d648b5452be63334fca511 100755 (executable)
--- 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 e5a760b76d7fe5e55ff455e5bac4660e5e1d1f5e..3c752748903adbece52b9ec07a46aad623230b5c 100755 (executable)
--- 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;