Merge branch 'gruvii-patch-2' into 2.0.3-wip

d8acc062 · Mark Otto · 82267d48 · 24860337 · d8acc062 · d8acc062
Commit d8acc062 authored Apr 14, 2012 by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 175 additions and 12 deletions

LICENSE LICENSE +173 -10

less/mixins.less less/mixins.less +2 -2

No files found.
--- a/LICENSE
+++ b/LICENSE
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -522,9 +522,9 @@
  margin-left: @gridGutterWidth * -1;
  .clearfix();
 }
-.makeColumn(@columns: 1) {
+.makeColumn(@columns: 1, @offset: 0) {
  float: left;
-  margin-left: @gridGutterWidth;
+  margin-left: (@gridColumnWidth * @offset) + (@gridGutterWidth * (@offset - 1)) + (@gridGutterWidth * 2);
  width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
 }