diff options
| author | Mark Otto <[email protected]> | 2013-08-11 20:45:42 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-11 20:45:42 -0700 |
| commit | c52a3508c616da928622bdfc930e2e11741a65e2 (patch) | |
| tree | c9a001864815a7c62dff888aecf5de9b60015a1f /less | |
| parent | 2ae8be3b316137fe63f5979480bdb731ed2b8c24 (diff) | |
| parent | f47a1905e2847e528d982fbd454b2b8c8ce900bb (diff) | |
| download | bootstrap-c52a3508c616da928622bdfc930e2e11741a65e2.tar.xz bootstrap-c52a3508c616da928622bdfc930e2e11741a65e2.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'less')
| -rw-r--r-- | less/responsive-utilities.less | 68 |
1 files changed, 28 insertions, 40 deletions
diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less index 38dd9639a..0815909cc 100644 --- a/less/responsive-utilities.less +++ b/less/responsive-utilities.less @@ -35,70 +35,58 @@ // Visibility utilities -// For Phones .visible-sm { .responsive-visibility(); + @media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) { + .responsive-invisibility(); + } + @media (min-width: @screen-desktop) { + .responsive-invisibility(); + } } .visible-md { .responsive-invisibility(); + @media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) { + .responsive-visibility(); + } + @media (min-width: @screen-desktop) { + .responsive-invisibility(); + } } .visible-lg { .responsive-invisibility(); -} - -.hidden-sm { - .responsive-invisibility(); -} -.hidden-md { - .responsive-visibility(); -} -.hidden-lg { - .responsive-visibility(); -} - - -// Tablets & small desktops only -@media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) { - .visible-sm { + @media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) { .responsive-invisibility(); } - .visible-md { + @media (min-width: @screen-desktop) { .responsive-visibility(); } - .visible-lg { - .responsive-invisibility(); - } +} - .hidden-sm { +.hidden-sm { + .responsive-invisibility(); + @media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) { .responsive-visibility(); } - .hidden-md { - .responsive-invisibility(); - } - .hidden-lg { + @media (min-width: @screen-desktop) { .responsive-visibility(); } } - -// For desktops -@media (min-width: @screen-desktop) { - .visible-sm { - .responsive-invisibility(); - } - .visible-md { +.hidden-md { + .responsive-visibility(); + @media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) { .responsive-invisibility(); } - .visible-lg { + @media (min-width: @screen-desktop) { .responsive-visibility(); } - - .hidden-sm { - .responsive-visibility(); - } - .hidden-md { +} +.hidden-lg { + .responsive-visibility(); + @media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) { .responsive-visibility(); } - .hidden-lg { + @media (min-width: @screen-desktop) { .responsive-invisibility(); } } |