0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00

Merge pull request #12863 from Sojaner/master

Fix for issue #12854 on push and pull resets
This commit is contained in:
Mark Otto 2014-03-04 14:21:28 -08:00
commit 56c6525f23

View File

@ -826,16 +826,26 @@
width: percentage((@index / @grid-columns)); width: percentage((@index / @grid-columns));
} }
} }
.calc-grid-column(@index, @class, @type) when (@type = push) { .calc-grid-column(@index, @class, @type) when (@type = push) and (@index > 0) {
.col-@{class}-push-@{index} { .col-@{class}-push-@{index} {
left: percentage((@index / @grid-columns)); left: percentage((@index / @grid-columns));
} }
} }
.calc-grid-column(@index, @class, @type) when (@type = pull) { .calc-grid-column(@index, @class, @type) when (@type = push) and (@index = 0) {
.col-@{class}-push-0 {
left: auto;
}
}
.calc-grid-column(@index, @class, @type) when (@type = pull) and (@index > 0) {
.col-@{class}-pull-@{index} { .col-@{class}-pull-@{index} {
right: percentage((@index / @grid-columns)); right: percentage((@index / @grid-columns));
} }
} }
.calc-grid-column(@index, @class, @type) when (@type = pull) and (@index = 0) {
.col-@{class}-pull-0 {
right: auto;
}
}
.calc-grid-column(@index, @class, @type) when (@type = offset) { .calc-grid-column(@index, @class, @type) when (@type = offset) {
.col-@{class}-offset-@{index} { .col-@{class}-offset-@{index} {
margin-left: percentage((@index / @grid-columns)); margin-left: percentage((@index / @grid-columns));