diff options
| author | Mark Otto <[email protected]> | 2012-06-10 23:02:30 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-06-10 23:02:30 -0700 |
| commit | 681b601561484c6a462e1abe7b90dbd4b5261083 (patch) | |
| tree | d64f8cb24f2894ae9c6010ef8d1219bd8841f79b | |
| parent | a0cd886c56708bbd8d6896ee81b04579f86fb0aa (diff) | |
| parent | c3f5d7c62d49de8de9947e84e9186bd2bf374008 (diff) | |
| download | bootstrap-681b601561484c6a462e1abe7b90dbd4b5261083.tar.xz bootstrap-681b601561484c6a462e1abe7b90dbd4b5261083.zip | |
Merge branch '2.1.0-wip' of https://github.com/marcusds/bootstrap into marcusds-2.1.0-wip
| -rwxr-xr-x[-rw-r--r--] | less/mixins.less | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/less/mixins.less b/less/mixins.less index 4f204d1af..8f89beb79 100644..100755 --- a/less/mixins.less +++ b/less/mixins.less @@ -596,6 +596,17 @@ } .spanX (0) {} + .offsetX (@index) when (@index > 0) { + (~'.offset@{index}, .row-fluid .offset@{index}:first-child') { .offset(@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%); + } + .span (@columns) { width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)); *width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%); @@ -614,8 +625,9 @@ margin-left: 0; } - // generate .spanX + // generate .spanX and .offsetX .spanX (@gridColumns); + .offsetX (@gridColumns); } } |