diff options
| author | Jonathan Camile <[email protected]> | 2012-02-28 11:06:05 +0100 |
|---|---|---|
| committer | Jonathan Camile <[email protected]> | 2012-02-28 11:06:05 +0100 |
| commit | a397130669a1462abff703989c38a63b0d2d63f0 (patch) | |
| tree | 71eab5c69724af04f68ed9fcf6edc7735e6b690a /less/responsive.less | |
| parent | 15759d9e7c5284016f76c08065f407386ae7348a (diff) | |
| parent | fbebb046f7134eaed90492bfc67720337c4b625e (diff) | |
| download | bootstrap-a397130669a1462abff703989c38a63b0d2d63f0.tar.xz bootstrap-a397130669a1462abff703989c38a63b0d2d63f0.zip | |
Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into features/warning_progress_bar
Diffstat (limited to 'less/responsive.less')
| -rw-r--r-- | less/responsive.less | 44 |
1 files changed, 38 insertions, 6 deletions
diff --git a/less/responsive.less b/less/responsive.less index 1547dce9e..7fa62cad9 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -31,6 +31,37 @@ visibility: hidden; } +// Visibility utilities + +// For desktops +.visible-phone { display: none; } +.visible-tablet { display: none; } +.visible-desktop { display: block; } +.hidden-phone { display: block; } +.hidden-tablet { display: block; } +.hidden-desktop { display: none; } + +// Phones only +@media (max-width: 767px) { + // Show + .visible-phone { display: block; } + // Hide + .hidden-phone { display: none; } + // Hide everything else + .hidden-desktop { display: block; } + .visible-desktop { display: none; } +} + +// Tablets & small desktops only +@media (min-width: 768px) and (max-width: 979px) { + // Show + .visible-tablet { display: block; } + // Hide + .hidden-tablet { display: none; } + // Hide everything else + .hidden-desktop { display: block; } + .visible-desktop { display: none; } +} // UP TO LANDSCAPE PHONE @@ -157,13 +188,13 @@ @media (min-width: 768px) and (max-width: 979px) { // Fixed grid - #gridSystem > .generate(12, 42px, 20px); + #grid > .core(42px, 20px); // Fluid grid - #fluidGridSystem > .generate(12, 5.801104972%, 2.762430939%); + #grid > .fluid(5.801104972%, 2.762430939%); // Input grid - #inputGridSystem > .generate(12, 42px, 20px); + #grid > .input(42px, 20px); } @@ -297,6 +328,7 @@ @media (min-width: 980px) { .nav-collapse.collapse { height: auto !important; + overflow: visible !important; } } @@ -308,13 +340,13 @@ @media (min-width: 1200px) { // Fixed grid - #gridSystem > .generate(12, 70px, 30px); + #grid > .core(70px, 30px); // Fluid grid - #fluidGridSystem > .generate(12, 5.982905983%, 2.564102564%); + #grid > .fluid(5.982905983%, 2.564102564%); // Input grid - #inputGridSystem > .generate(12, 70px, 30px); + #grid > .input(70px, 30px); // Thumbnails .thumbnails { |