Merge pull request #12863 from Sojaner/master

Fix for issue #12854 on push and pull resets

Merge pull request #12863 from Sojaner/master
Fix for issue #12854 on push and pull resets
56c6525f · Mark Otto · 8f2a787c · 77cd015c · 56c6525f
Commit 56c6525f authored 11 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 12 additions and 2 deletions
+12 -2
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -826,16 +826,26 @@
    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} {
    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} {
    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) {
  .col-@{class}-offset-@{index} {
    margin-left: percentage((@index / @grid-columns));