diff options
| author | Mark Otto <[email protected]> | 2012-06-20 20:22:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-06-20 20:22:22 -0700 |
| commit | f2dadecbf39bf993efd3b82d33adcd87993e0499 (patch) | |
| tree | 3782ddf07bef753c3b43b02595ffaf08aa955a9b | |
| parent | 681b601561484c6a462e1abe7b90dbd4b5261083 (diff) | |
| parent | 97cbefa72f4b60dc72077f61a03b44a0d4f9b960 (diff) | |
| download | bootstrap-f2dadecbf39bf993efd3b82d33adcd87993e0499.tar.xz bootstrap-f2dadecbf39bf993efd3b82d33adcd87993e0499.zip | |
Merge branch '2.1.0-wip' of https://github.com/marcusds/bootstrap into marcusds-2.1.0-wip
| -rw-r--r--[-rwxr-xr-x] | less/mixins.less | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/less/mixins.less b/less/mixins.less index 8f89beb79..8698ab0e3 100755..100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -597,14 +597,20 @@ .spanX (0) {} .offsetX (@index) when (@index > 0) { - (~'.offset@{index}, .row-fluid .offset@{index}:first-child') { .offset(@index); } + (~'.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; - *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%); + 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) { |