diff --git a/scss/_variables.scss b/scss/_variables.scss
index 5f41979f0e..8f9e26d68d 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -294,7 +294,7 @@ $screen-xs-max:              ($screen-sm-min - .1);
 //== Grid system
 //
 //## Define your custom responsive grid.
-
+$grid-breakpoints: (xs sm md lg xl);
 //** Number of columns in the grid.
 $grid-columns:               12;
 //** Padding between columns. Gets divided in half for the left and right.
diff --git a/scss/mixins/_grid-framework.scss b/scss/mixins/_grid-framework.scss
index 5ac62751fd..3eecbae8b2 100644
--- a/scss/mixins/_grid-framework.scss
+++ b/scss/mixins/_grid-framework.scss
@@ -3,65 +3,69 @@
 // Used only by Bootstrap to generate the correct number of grid classes given
 // any value of `$grid-columns`.
 
-%twbs-grid-column {
-  position: relative;
-  // Prevent columns from collapsing when empty
-  min-height: 1px;
-  // Inner gutter via padding
-  padding-left: ($grid-gutter-width / 2);
-  padding-right: ($grid-gutter-width / 2);
-}
-
-%twbs-grid-column-float {
-  float: left
-}
-
-@mixin make-grid-columns($columns: $grid-columns) {
+// Common properties for all breakpoints
+@mixin make-grid-columns($columns: $grid-columns, $breakpoints: $grid-breakpoints) {
+  %grid-column {
+    position: relative;
+    // Prevent columns from collapsing when empty
+    min-height: 1px;
+    // Inner gutter via padding
+    padding-left: ($grid-gutter-width / 2);
+    padding-right: ($grid-gutter-width / 2);
+  }
   @for $i from 1 through $columns {
-    .col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}, .col-xl-#{$i} {
-      @extend %twbs-grid-column;
+    @each $breakpoint in $breakpoints {
+      .col-#{$breakpoint}-#{$i} {
+        @extend %grid-column;
+      }
     }
   }
 }
 
-@mixin float-grid-columns($class, $columns: $grid-columns) {
+// Breakpoint-specific properties
+@mixin make-grid($breakpoint, $columns: $grid-columns) {
+  // Work around cross-media @extend (https://github.com/sass/sass/issues/1050)
+  %grid-column-float-#{$breakpoint} {
+    float: left;
+  }
   @for $i from 1 through $columns {
-    .col-#{$class}-#{$i} {
-      @extend %twbs-grid-column-float;
+    .col-#{$breakpoint}-#{$i} {
+      @extend %grid-column-float-#{$breakpoint};
+      @include grid-column-width($i, $columns);
+    }
+  }
+  @each $modifier in (pull, push, offset) {
+    @for $i from 0 through $columns {
+      .col-#{$breakpoint}-#{$modifier}-#{$i} {
+        @include grid-column-modifier($modifier, $i, $columns)
+      }
     }
   }
 }
 
-@mixin calc-grid-column($index, $class, $type, $columns: $grid-columns) {
-  @if ($type == width) and ($index > 0) {
-    .col-#{$class}-#{$index} {
-      width: percentage($index / $columns);
-    }
-  }
+@mixin grid-column-width($index, $columns) {
+  width: percentage($index / $columns);
+}
+
+@mixin grid-column-push($index, $columns) {
+  left: if($index > 0, percentage($index / $columns), auto);
+}
+
+@mixin grid-column-pull($index, $columns) {
+  right: if($index > 0, percentage($index / $columns), auto);
+}
+
+@mixin grid-column-offset($index, $columns) {
+  margin-left: percentage($index / $columns);
+}
+
+// Work around the lack of dynamic mixin @include support (https://github.com/sass/sass/issues/626)
+@mixin grid-column-modifier($type, $index, $columns) {
   @if $type == push {
-    .col-#{$class}-push-#{$index} {
-      left: if($index > 0, percentage($index / $columns), auto);
-    }
-  }
-  @if $type == pull {
-    .col-#{$class}-pull-#{$index} {
-      right: if($index > 0, percentage($index / $columns), auto);
-    }
-  }
-  @if $type == offset {
-    .col-#{$class}-offset-#{$index} {
-      margin-left: percentage($index / $columns);
-    }
-  }
-}
-
-// Create grid for specific class
-@mixin make-grid($class, $columns: $grid-columns) {
-  @include float-grid-columns($class);
-  @for $i from 0 through $columns {
-    @include calc-grid-column($i, $class, width, $columns);
-    @include calc-grid-column($i, $class, push, $columns);
-    @include calc-grid-column($i, $class, pull, $columns);
-    @include calc-grid-column($i, $class, offset, $columns);
+    @include grid-column-push($index, $columns);
+  } @else if $type == pull {
+    @include grid-column-pull($index, $columns);
+  } @else if $type == offset {
+    @include grid-column-offset($index, $columns);
   }
 }