1 files changed, 16 insertions, 7 deletions
diff --git a/scss/_grid.scss b/scss/_grid.scss
index a227515379..f70e849517 100644
--- a/scss/_grid.scss
+++ b/scss/_grid.scss
@@ -3,23 +3,32 @@
 // Set the container width, and override it for fixed navbars in media queries.
 
 @if $enable-grid-classes {
+  // Single container class with breakpoint max-widths
   .container {
     @include make-container();
     @include make-container-max-widths();
   }
-}
-
-// Fluid container
-//
-// Utilizes the mixin meant for fixed width containers, but with 100% width for
-// fluid, full width layouts.
 
-@if $enable-grid-classes {
+  // 100% wide container at all breakpoints
   .container-fluid {
     @include make-container();
   }
+
+  // Responsive containers that are 100% wide until a breakpoint
+  @each $breakpoint, $container-max-width in $container-max-widths {
+    .container-#{$breakpoint} {
+      @include make-container();
+    }
+
+    @include media-breakpoint-up($breakpoint, $grid-breakpoints) {
+      .container-#{$breakpoint} {
+        max-width: $container-max-width;
+      }
+    }
+  }
 }
 
+
 // Row
 //
 // Rows contain and clear the floats of your columns.