1 files changed, 12 insertions, 2 deletions
diff --git a/assets/stylesheets/bootstrap/mixins/_grid-framework.scss b/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
index aa5f492..16c970a 100644
--- a/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
+++ b/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
@@ -13,13 +13,15 @@
     padding-left: ($gutter / 2);
     padding-right: ($gutter / 2);
   }
+  $breakpoint-counter: 0;
   @each $breakpoint in map-keys($breakpoints) {
+    $breakpoint-counter: ($breakpoint-counter + 1);
     @for $i from 1 through $columns {
       .col-#{$breakpoint}-#{$i} {
         @extend %grid-column;
       }
     }
-    @include media-breakpoint-up($breakpoint) {
+    @include media-breakpoint-up($breakpoint, $breakpoints) {
       // Work around cross-media @extend (https://github.com/sass/sass/issues/1050)
       %grid-column-float-#{$breakpoint} {
         float: left;
@@ -32,13 +34,21 @@
           @include make-col-span($i, $columns);
         }
       }
-      @each $modifier in (pull, push, offset) {
+      @each $modifier in (pull, push) {
         @for $i from 0 through $columns {
           .col-#{$breakpoint}-#{$modifier}-#{$i} {
             @include make-col-modifier($modifier, $i, $columns)
           }
         }
       }
+      // `$columns - 1` because offsetting by the width of an entire row isn't possible
+      @for $i from 0 through ($columns - 1) {
+        @if $breakpoint-counter != 1 or $i != 0 { // Avoid emitting useless .col-xs-offset-0
+          .col-#{$breakpoint}-offset-#{$i} {
+            @include make-col-modifier(offset, $i, $columns)
+          }
+        }
+      }
     }
   }
 }