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

Refactor grid_framework

Browse Source 
A more idiomatic refactoring of the grid framework

* Use %-placeholder instead of generating a class name list
* Use if expression
* Remove loop-grid-columns
This commit is contained in:
Gleb Mazovetskiy
2014-12-05 10:53:43 +00:00
parent 57071cc68a
commit 795a584561
1 changed files with 39 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,12 +3,7 @@
// Used only by Bootstrap to generate the correct number of grid classes given // Used only by Bootstrap to generate the correct number of grid classes given
// any value of `$grid-columns`. // any value of `$grid-columns`.
// [converter] This is defined recursively in LESS, but Sass supports real loops %twbs-grid-column {
@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}";
}
#{$list} {
position: relative; position: relative;
// Prevent columns from collapsing when empty // Prevent columns from collapsing when empty
min-height: 1px; min-height: 1px;
@@ -16,66 +11,57 @@
padding-left: ($grid-gutter-width / 2); padding-left: ($grid-gutter-width / 2);
padding-right: ($grid-gutter-width / 2); padding-right: ($grid-gutter-width / 2);
} }
%twbs-grid-column-float {
float: left
} }
@mixin make-grid-columns($columns: $grid-columns) {
// [converter] This is defined recursively in LESS, but Sass supports real loops @for $i from 1 through $columns {
@mixin float-grid-columns($class, $i: 1, $list: ".col-#{$class}-#{$i}") { .col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}, .col-xl-#{$i} {
@for $i from (1 + 1) through $grid-columns { @extend %twbs-grid-column;
$list: "#{$list}, .col-#{$class}-#{$i}";
} }
#{$list} {
float: left;
} }
} }
@mixin float-grid-columns($class, $columns: $grid-columns) {
@for $i from 1 through $columns {
.col-#{$class}-#{$i} {
@extend %twbs-grid-column-float;
}
}
}
@mixin calc-grid-column($index, $class, $type) { @mixin calc-grid-column($index, $class, $type, $columns: $grid-columns) {
@if ($type == width) and ($index > 0) { @if ($type == width) and ($index > 0) {
.col-#{$class}-#{$index} { .col-#{$class}-#{$index} {
width: percentage(($index / $grid-columns)); width: percentage($index / $columns);
} }
} }
@if ($type == push) and ($index > 0) { @if $type == push {
.col-#{$class}-push-#{$index} { .col-#{$class}-push-#{$index} {
left: percentage(($index / $grid-columns)); left: if($index > 0, percentage($index / $columns), auto);
} }
} }
@if ($type == push) and ($index == 0) { @if $type == pull {
.col-#{$class}-push-0 {
left: auto;
}
}
@if ($type == pull) and ($index > 0) {
.col-#{$class}-pull-#{$index} { .col-#{$class}-pull-#{$index} {
right: percentage(($index / $grid-columns)); right: if($index > 0, percentage($index / $columns), auto);
} }
} }
@if ($type == pull) and ($index == 0) { @if $type == offset {
.col-#{$class}-pull-0 {
right: auto;
}
}
@if ($type == offset) {
.col-#{$class}-offset-#{$index} { .col-#{$class}-offset-#{$index} {
margin-left: percentage(($index / $grid-columns)); margin-left: percentage($index / $columns);
} }
} }
} }
// [converter] This is defined recursively in LESS, but Sass supports real loops
@mixin loop-grid-columns($columns, $class, $type) {
@for $i from 0 through $columns {
@include calc-grid-column($i, $class, $type);
}
}
// Create grid for specific class // Create grid for specific class
@mixin make-grid($class) { @mixin make-grid($class, $columns: $grid-columns) {
@include float-grid-columns($class); @include float-grid-columns($class);
@include loop-grid-columns($grid-columns, $class, width); @for $i from 0 through $columns {
@include loop-grid-columns($grid-columns, $class, pull); @include calc-grid-column($i, $class, width, $columns);
@include loop-grid-columns($grid-columns, $class, push); @include calc-grid-column($i, $class, push, $columns);
@include loop-grid-columns($grid-columns, $class, offset); @include calc-grid-column($i, $class, pull, $columns);
@include calc-grid-column($i, $class, offset, $columns);
}
} }