mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-15 10:05:40 +02:00
Code Issues Releases Wiki Activity

Merge pull request #18473 from twbs/fix-18036

Browse Source 
Remove useless .col-*-offset-12 and .col-xs-offset-0 classes
This commit is contained in:
Chris Rebert
2015-12-23 20:33:37 -07:00
parent b6fcabf892 c5a3e897d6
commit 1e8743ec89
2 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dist/css/bootstrap.css
View File

@@ -988,10 +988,6 @@ pre code {
left: 100%; left: 100%;
} }
.col-xs-offset-0 {
margin-left: 0;
}
.col-xs-offset-1 { .col-xs-offset-1 {
margin-left: 8.333333%; margin-left: 8.333333%;
} }
@@ -1036,10 +1032,6 @@ pre code {
margin-left: 91.666667%; margin-left: 91.666667%;
} }
.col-xs-offset-12 {
margin-left: 100%;
}
@media (min-width: 544px) { @media (min-width: 544px) {
.col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
float: left; float: left;
@@ -1194,9 +1186,6 @@ pre code {
.col-sm-offset-11 { .col-sm-offset-11 {
margin-left: 91.666667%; margin-left: 91.666667%;
} }
.col-sm-offset-12 {
margin-left: 100%;
}
} }
@media (min-width: 768px) { @media (min-width: 768px) {
@@ -1353,9 +1342,6 @@ pre code {
.col-md-offset-11 { .col-md-offset-11 {
margin-left: 91.666667%; margin-left: 91.666667%;
} }
.col-md-offset-12 {
margin-left: 100%;
}
} }
@media (min-width: 992px) { @media (min-width: 992px) {
@@ -1512,9 +1498,6 @@ pre code {
.col-lg-offset-11 { .col-lg-offset-11 {
margin-left: 91.666667%; margin-left: 91.666667%;
} }
.col-lg-offset-12 {
margin-left: 100%;
}
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
@@ -1671,9 +1654,6 @@ pre code {
.col-xl-offset-11 { .col-xl-offset-11 {
margin-left: 91.666667%; margin-left: 91.666667%;
} }
.col-xl-offset-12 {
margin-left: 100%;
}
} }
.table { .table {

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

@@ -13,7 +13,9 @@
padding-left: ($gutter / 2); padding-left: ($gutter / 2);
padding-right: ($gutter / 2); padding-right: ($gutter / 2);
} }
$breakpoint-counter: 0;
@each $breakpoint in map-keys($breakpoints) { @each $breakpoint in map-keys($breakpoints) {
$breakpoint-counter: ($breakpoint-counter + 1);
@for $i from 1 through $columns { @for $i from 1 through $columns {
.col-#{$breakpoint}-#{$i} { .col-#{$breakpoint}-#{$i} {
@extend %grid-column; @extend %grid-column;
@@ -32,13 +34,21 @@
@include make-col-span($i, $columns); @include make-col-span($i, $columns);
} }
} }
@each $modifier in (pull, push, offset) { @each $modifier in (pull, push) {
@for $i from 0 through $columns { @for $i from 0 through $columns {
.col-#{$breakpoint}-#{$modifier}-#{$i} { .col-#{$breakpoint}-#{$modifier}-#{$i} {
@include make-col-modifier($modifier, $i, $columns) @include make-col-modifier($modifier, $i, $columns)
} }
} }
} }
// `$columns - 1` because offsetting by the width of an entire row isn't possible
@for $i from 0 through ($columns - 1) {
@if $breakpoint-counter != 1 or $i != 0 { // Avoid emitting useless .col-xs-offset-0
.col-#{$breakpoint}-offset-#{$i} {
@include make-col-modifier(offset, $i, $columns)
}
}
}
} }
} }
} }