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

7301931a · Mark Otto · f5a2d82a · 97cbefa7 · 7301931a
Commit 7301931a authored Jun 20, 2012 by Mark Otto
Show whitespace changes
Inline Side-by-side

Showing with 19 additions and 1 deletion

less/mixins.less less/mixins.less +19 -1

No files found.
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -634,6 +634,23 @@
    }
    .spanX (0) {}

+    .offsetX (@index) when (@index > 0) {
+      (~'.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*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) {
      width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1));
      *width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%);
@@ -652,8 +669,9 @@
        margin-left: 0;
      }

-      // generate .spanX
+      // generate .spanX and .offsetX
      .spanX (@gridColumns);
+      .offsetX (@gridColumns);
    }

  }