aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-04-14 18:11:31 -0700
committerMark Otto <[email protected]>2012-04-14 18:11:31 -0700
commit2486033754df0407baaae3c3eeead75dc86820a0 (patch)
tree526e285d751524e27e64468fe09c3383bf0f5f5b
parent11064c4d344a9c922f05fba9783f36767a5febf1 (diff)
parentd115d169b72d165d8b84c6e16d3b132b28b96d1d (diff)
downloadbootstrap-2486033754df0407baaae3c3eeead75dc86820a0.tar.xz
bootstrap-2486033754df0407baaae3c3eeead75dc86820a0.zip
Merge branch 'patch-2' of https://github.com/gruvii/bootstrap into gruvii-patch-2
-rw-r--r--less/mixins.less4
1 files changed, 2 insertions, 2 deletions
diff --git a/less/mixins.less b/less/mixins.less
index 0074e8924..13fbb5cf8 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -507,9 +507,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));
}