diff options
| author | fat <[email protected]> | 2013-02-05 22:30:54 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2013-02-05 22:30:54 -0800 |
| commit | 3b56227553f40cc567e161c68c64f1e315fd5241 (patch) | |
| tree | 0ecd914f0c395b277dc46300733d8bc05ab4802e /less | |
| parent | 481428154084a9fafd31d8654157d6f6f78231d0 (diff) | |
| parent | accfdaafdbfc172f4d8358bbab820a9862bd8eb9 (diff) | |
| download | bootstrap-3b56227553f40cc567e161c68c64f1e315fd5241.tar.xz bootstrap-3b56227553f40cc567e161c68c64f1e315fd5241.zip | |
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
Diffstat (limited to 'less')
| -rw-r--r-- | less/mixins.less | 13 | ||||
| -rw-r--r-- | less/responsive-utilities.less | 9 |
2 files changed, 15 insertions, 7 deletions
diff --git a/less/mixins.less b/less/mixins.less index cc69d750e..79d889219 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -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) {} @@ -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) {} @@ -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) {} @@ -699,5 +699,4 @@ .spanX (@gridColumns); } - } diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less index 1ed1a1369..bf43e8ef7 100644 --- a/less/responsive-utilities.less +++ b/less/responsive-utilities.less @@ -48,3 +48,12 @@ // Hide .hidden-phone { display: none !important; } } + +// Print utilities +.visible-print { display: none !important; } +.hidden-print { } + +@media print { + .visible-print { display: inherit !important; } + .hidden-print { display: none !important; } +} |