From 671e650d18371331e75599b2266fc800cc518721 Mon Sep 17 00:00:00 2001
From: Jay Sitter <jsitter@mit.edu>
Date: Fri, 26 May 2017 14:03:17 -0400
Subject: [PATCH] Don't collapse columns with large-offset (fix #307)

---
 scss/grid/_grid.scss | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/scss/grid/_grid.scss b/scss/grid/_grid.scss
index ea81daa2..29b2e73a 100755
--- a/scss/grid/_grid.scss
+++ b/scss/grid/_grid.scss
@@ -116,12 +116,14 @@ th.column {
   }
 
   //Collapsed logic
-  .collapse {
-    > tbody > tr > td.large-#{$i},
-    > tbody > tr > th.large-#{$i} {
-      padding-right: 0;
-      padding-left: 0;
-      width: -zf-grid-calc-px($i, $grid-column-count, $global-width) + $global-gutter;
+  .collapse > tbody > tr {
+    > td.large-#{$i},
+    > th.large-#{$i} {
+      &:not([class*=large-offset]) {
+        padding-right: 0;
+        padding-left: 0;
+        width: -zf-grid-calc-px($i, $grid-column-count, $global-width) + $global-gutter;
+      }
     }
 
     //Gotta give it that extra love for the first and last columns.
-- 
2.47.2