Skip to content

Commit

Permalink
Merge pull request twbs#6780 from agatronic/2.3.0-wip
Browse files Browse the repository at this point in the history
less: Move to new selector interpolation, supported from 1.3.1
  • Loading branch information
fat committed Feb 6, 2013
2 parents 1629df8 + 6b9bb54 commit 042bb9b
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions less/mixins.less
Original file line number Diff line number Diff line change
Expand Up @@ -575,13 +575,13 @@
.core (@gridColumnWidth, @gridGutterWidth) {

.spanX (@index) when (@index > 0) {
(~".span@{index}") { .span(@index); }
.span@{index} { .span(@index); }
.spanX(@index - 1);
}
.spanX (0) {}

.offsetX (@index) when (@index > 0) {
(~".offset@{index}") { .offset(@index); }
.offset@{index} { .offset(@index); }
.offsetX(@index - 1);
}
.offsetX (0) {}
Expand Down Expand Up @@ -620,14 +620,14 @@
.fluid (@fluidGridColumnWidth, @fluidGridGutterWidth) {

.spanX (@index) when (@index > 0) {
(~".span@{index}") { .span(@index); }
.span@{index} { .span(@index); }
.spanX(@index - 1);
}
.spanX (0) {}

.offsetX (@index) when (@index > 0) {
(~'.offset@{index}') { .offset(@index); }
(~'.offset@{index}:first-child') { .offsetFirstChild(@index); }
.offset@{index} { .offset(@index); }
.offset@{index}:first-child { .offsetFirstChild(@index); }
.offsetX(@index - 1);
}
.offsetX (0) {}
Expand Down Expand Up @@ -675,7 +675,7 @@
.input(@gridColumnWidth, @gridGutterWidth) {

.spanX (@index) when (@index > 0) {
(~"input.span@{index}, textarea.span@{index}, .uneditable-input.span@{index}") { .span(@index); }
input.span@{index}, textarea.span@{index}, .uneditable-input.span@{index} { .span(@index); }
.spanX(@index - 1);
}
.spanX (0) {}
Expand All @@ -699,5 +699,4 @@
.spanX (@gridColumns);

}

}

0 comments on commit 042bb9b

Please sign in to comment.