Skip to content

Commit

Permalink
Fixes #11295: Restore offset, push, and pull zero classes (e.g., .col…
Browse files Browse the repository at this point in the history
…-md-offset-0)
  • Loading branch information
mdo committed Nov 6, 2013
1 parent d1048a7 commit 88a0664
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 3 deletions.
39 changes: 39 additions & 0 deletions dist/css/bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -996,6 +996,10 @@ pre code {
right: 8.333333333333332%;
}

.col-xs-pull-0 {
right: 0;
}

.col-xs-push-12 {
left: 100%;
}
Expand Down Expand Up @@ -1044,6 +1048,10 @@ pre code {
left: 8.333333333333332%;
}

.col-xs-push-0 {
left: 0;
}

.col-xs-offset-12 {
margin-left: 100%;
}
Expand Down Expand Up @@ -1092,6 +1100,10 @@ pre code {
margin-left: 8.333333333333332%;
}

.col-xs-offset-0 {
margin-left: 0;
}

@media (min-width: 768px) {
.container {
width: 750px;
Expand Down Expand Up @@ -1181,6 +1193,9 @@ pre code {
.col-sm-pull-1 {
right: 8.333333333333332%;
}
.col-sm-pull-0 {
right: 0;
}
.col-sm-push-12 {
left: 100%;
}
Expand Down Expand Up @@ -1217,6 +1232,9 @@ pre code {
.col-sm-push-1 {
left: 8.333333333333332%;
}
.col-sm-push-0 {
left: 0;
}
.col-sm-offset-12 {
margin-left: 100%;
}
Expand Down Expand Up @@ -1253,6 +1271,9 @@ pre code {
.col-sm-offset-1 {
margin-left: 8.333333333333332%;
}
.col-sm-offset-0 {
margin-left: 0;
}
}

@media (min-width: 992px) {
Expand Down Expand Up @@ -1344,6 +1365,9 @@ pre code {
.col-md-pull-1 {
right: 8.333333333333332%;
}
.col-md-pull-0 {
right: 0;
}
.col-md-push-12 {
left: 100%;
}
Expand Down Expand Up @@ -1380,6 +1404,9 @@ pre code {
.col-md-push-1 {
left: 8.333333333333332%;
}
.col-md-push-0 {
left: 0;
}
.col-md-offset-12 {
margin-left: 100%;
}
Expand Down Expand Up @@ -1416,6 +1443,9 @@ pre code {
.col-md-offset-1 {
margin-left: 8.333333333333332%;
}
.col-md-offset-0 {
margin-left: 0;
}
}

@media (min-width: 1200px) {
Expand Down Expand Up @@ -1507,6 +1537,9 @@ pre code {
.col-lg-pull-1 {
right: 8.333333333333332%;
}
.col-lg-pull-0 {
right: 0;
}
.col-lg-push-12 {
left: 100%;
}
Expand Down Expand Up @@ -1543,6 +1576,9 @@ pre code {
.col-lg-push-1 {
left: 8.333333333333332%;
}
.col-lg-push-0 {
left: 0;
}
.col-lg-offset-12 {
margin-left: 100%;
}
Expand Down Expand Up @@ -1579,6 +1615,9 @@ pre code {
.col-lg-offset-1 {
margin-left: 8.333333333333332%;
}
.col-lg-offset-0 {
margin-left: 0;
}
}

table {
Expand Down
2 changes: 1 addition & 1 deletion dist/css/bootstrap.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions less/mixins.less
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@
.col(1); // kickstart it
}

.calc-grid(@index, @class, @type) when (@type = width) {
.calc-grid(@index, @class, @type) when (@type = width) and (@index > 0) {
.col-@{class}-@{index} {
width: percentage((@index / @grid-columns));
}
Expand All @@ -772,7 +772,7 @@
}

// Basic looping in LESS
.make-grid(@index, @class, @type) when (@index > 0) {
.make-grid(@index, @class, @type) when (@index >= 0) {
.calc-grid(@index, @class, @type);
// next iteration
.make-grid(@index - 1, @class, @type);
Expand Down

0 comments on commit 88a0664

Please sign in to comment.