0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-21 18:54:30 +01:00

Merge pull request #18695 from bassjobsen/patch-30

.container, .container-fluid should be conditional upon $enable-grid-…
This commit is contained in:
Mark Otto 2016-01-06 01:00:22 -08:00
commit 3dd08d60eb

View File

@ -2,22 +2,23 @@
// //
// Set the container width, and override it for fixed navbars in media queries. // Set the container width, and override it for fixed navbars in media queries.
@if $enable-grid-classes {
.container { .container {
@include make-container(); @include make-container();
@include make-container-max-widths(); @include make-container-max-widths();
} }
}
// Fluid container // Fluid container
// //
// Utilizes the mixin meant for fixed width containers, but without any defined // Utilizes the mixin meant for fixed width containers, but without any defined
// width for fluid, full width layouts. // width for fluid, full width layouts.
@if $enable-grid-classes {
.container-fluid { .container-fluid {
@include make-container(); @include make-container();
} }
}
// Row // Row
// //