Merge branch '2.1.0-wip' of https://github.com/marcusds/bootstrap into marcusds-2.1.0-wip

681b6015 · Mark Otto · a0cd886c · c3f5d7c6 · 681b6015
Commit 681b6015 authored Jun 10, 2012 by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 1 deletion

less/mixins.less less/mixins.less +13 -1

No files found.
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -596,6 +596,17 @@
    }
    .spanX (0) {}
+    .offsetX (@index) when (@index > 0) {
+      (~'.offset@{index}, .row-fluid .offset@{index}:first-child') { .offset(@index); }
+      .offsetX(@index - 1);
+    }
+    .offsetX (0) {}
+    .offset (@columns) {
+      margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + @fluidGridGutterWidth;
+	  *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%);
+    }
    .span (@columns) {
      width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1));
      *width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%);
@@ -614,8 +625,9 @@
        margin-left: 0;
      }
-      // generate .spanX
+      // generate .spanX and .offsetX
      .spanX (@gridColumns);
+      .offsetX (@gridColumns);
    }
  }