diff options
| author | Mark Otto <[email protected]> | 2014-12-04 22:32:39 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-12-04 22:32:39 -0800 |
| commit | bc3a2f669d6527c72e3896af5c2fc97048e67595 (patch) | |
| tree | 090813babd728eab2bfe383b181e9dcdba16dd5a /scss | |
| parent | be1473128bf00504c63d294ec508cd514e8280bf (diff) | |
| download | bootstrap-bc3a2f669d6527c72e3896af5c2fc97048e67595.tar.xz bootstrap-bc3a2f669d6527c72e3896af5c2fc97048e67595.zip | |
fix vars order, remove rando grid class from mixin
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_variables.scss | 4 | ||||
| -rw-r--r-- | scss/mixins/_grid-framework.scss | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scss/_variables.scss b/scss/_variables.scss index 703e582ef..5f41979f0 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -276,12 +276,12 @@ $zindex-modal: 1040; $screen-xl-min: 75em; // Large screen / desktop -$screen-lg-min: 62em; $screen-lg-max: ($screen-xl-min - .1); +$screen-lg-min: 62em; // Medium screen / tablet -$screen-md-min: 48em; $screen-md-max: ($screen-lg-min - .1); +$screen-md-min: 48em; // Small screen / phone $screen-sm-max: ($screen-md-min - .1); diff --git a/scss/mixins/_grid-framework.scss b/scss/mixins/_grid-framework.scss index 6c0fd530b..b75517d29 100644 --- a/scss/mixins/_grid-framework.scss +++ b/scss/mixins/_grid-framework.scss @@ -4,7 +4,7 @@ // any value of `$grid-columns`. // [converter] This is defined recursively in LESS, but Sass supports real loops -@mixin make-grid-columns($i: 1, $list: ".col-#{$i}, .col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}, .col-xl-#{$i}") { +@mixin make-grid-columns($i: 1, $list: ".col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}, .col-xl-#{$i}") { @for $i from (1 + 1) through $grid-columns { $list: "#{$list}, .col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}, .col-xl-#{$i}"; } |