mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-19 11:51:23 +02:00
Code Issues Releases Wiki Activity

fix vars order, remove rando grid class from mixin

Browse Source
This commit is contained in:
Mark Otto
2014-12-04 22:32:39 -08:00
parent be1473128b
commit bc3a2f669d
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scss/_variables.scss
View File

@@ -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);

2
scss/mixins/_grid-framework.scss
View File

@@ -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}";
}