mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-20 17:54:23 +01:00
Merge pull request #18695 from bassjobsen/patch-30
.container, .container-fluid should be conditional upon $enable-grid-…
This commit is contained in:
commit
3dd08d60eb
@ -2,23 +2,24 @@
|
|||||||
//
|
//
|
||||||
// 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.
|
||||||
|
|
||||||
.container {
|
@if $enable-grid-classes {
|
||||||
@include make-container();
|
.container {
|
||||||
@include make-container-max-widths();
|
@include make-container();
|
||||||
|
@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.
|
||||||
|
|
||||||
.container-fluid {
|
@if $enable-grid-classes {
|
||||||
@include make-container();
|
.container-fluid {
|
||||||
|
@include make-container();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Row
|
// Row
|
||||||
//
|
//
|
||||||
// Rows contain and clear the floats of your columns.
|
// Rows contain and clear the floats of your columns.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user