kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

Merge pull request #17259 from twbs/v4gc 

v4: Conditional predefined grid classes
This commit is contained in:
Mark Otto 2015-09-01 20:16:22 -07:00
parent c053f23fe6 7633d4c603
commit a748e251fd
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scss/_grid.scss
View File

@ -23,8 +23,10 @@
//
// Rows contain and clear the floats of your columns.
.row {
@include make-row();
@if $enable-grid-classes {
.row {
@include make-row();
}
}
@ -32,14 +34,16 @@
//
// Common styles for small and large grid columns
@include make-grid-columns();
@if $enable-grid-classes {
@include make-grid-columns();
}
// Flex variation
//
// Custom styles for additional flex alignment options.
@if $enable-flex {
@if $enable-flex and $enable-grid-classes {
// Flex column reordering

1
scss/_variables.scss
View File

@ -49,6 +49,7 @@ $enable-shadows: false !default;
$enable-gradients: false !default;
$enable-transitions: false !default;
$enable-hover-media-query: false !default;
$enable-grid-classes: true !default;
// Spacing