diff options
| author | Mark Otto <[email protected]> | 2012-04-14 18:11:40 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-04-14 18:11:40 -0700 |
| commit | d8acc062c1503fbda10bfa5041677c1459654b62 (patch) | |
| tree | 6561437735eab099607cc71809eece2e724f6b2b /less | |
| parent | 82267d48ffb522ed4c9cb491660f7d1c8a9e0236 (diff) | |
| parent | 2486033754df0407baaae3c3eeead75dc86820a0 (diff) | |
| download | bootstrap-d8acc062c1503fbda10bfa5041677c1459654b62.tar.xz bootstrap-d8acc062c1503fbda10bfa5041677c1459654b62.zip | |
Merge branch 'gruvii-patch-2' into 2.0.3-wip
Diffstat (limited to 'less')
| -rw-r--r-- | less/mixins.less | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/less/mixins.less b/less/mixins.less index a419a56ba..73e6ade56 100644 --- 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)); } |