kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

Fixes #11295: Restore offset, push, and pull zero classes (e.g., .col-md-offset-0)

This commit is contained in:
Mark Otto 2013-11-06 13:03:08 -08:00
parent d1048a7837
commit 88a06640dd
3 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dist/css/bootstrap.css vendored
View File

@ -996,6 +996,10 @@ pre code {
right: 8.333333333333332%;
}
.col-xs-pull-0 {
right: 0;
}
.col-xs-push-12 {
left: 100%;
}
@ -1044,6 +1048,10 @@ pre code {
left: 8.333333333333332%;
}
.col-xs-push-0 {
left: 0;
}
.col-xs-offset-12 {
margin-left: 100%;
}
@ -1092,6 +1100,10 @@ pre code {
margin-left: 8.333333333333332%;
}
.col-xs-offset-0 {
margin-left: 0;
}
@media (min-width: 768px) {
.container {
width: 750px;
@ -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%;
}
@ -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%;
}
@ -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) {
@ -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%;
}
@ -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%;
}
@ -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) {
@ -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%;
}
@ -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%;
}
@ -1579,6 +1615,9 @@ pre code {
.col-lg-offset-1 {
margin-left: 8.333333333333332%;
}
.col-lg-offset-0 {
margin-left: 0;
}
}
table {

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
less/mixins.less
View File

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