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

f2dadecb · Mark Otto · 681b6015 · 97cbefa7 · f2dadecb
Commit f2dadecb authored Jun 20, 2012 by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

less/mixins.less less/mixins.less +9 -3

No files found.
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -597,14 +597,20 @@
    .spanX (0) {}

    .offsetX (@index) when (@index > 0) {
-      (~'.offset@{index}, .row-fluid .offset@{index}:first-child') { .offset(@index); }
+      (~'.offset@{index}') { .offset(@index); }
+      (~'.offset@{index}:first-child') { .offsetFirstChild(@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%);
+      margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth*2);
+	  *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + (@fluidGridGutterWidth*2) - (.5 / @gridRowWidth * 100 * 1%);
+    }
+    
+    .offsetFirstChild (@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) {