aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-07-12 16:24:37 -0700
committerMark Otto <[email protected]>2012-07-12 16:24:37 -0700
commit7d324ee35b96a7d177bd301e2f11fe442713a1f6 (patch)
treee5bbb11613239b679bd1284805a37434f582355b /docs
parent3c775f24323d649f55aaa175eb6a1a19024ab30c (diff)
parentf0ed383e51f4513273bd96636d5c630f792e08e9 (diff)
downloadbootstrap-7d324ee35b96a7d177bd301e2f11fe442713a1f6.tar.xz
bootstrap-7d324ee35b96a7d177bd301e2f11fe442713a1f6.zip
Merge branch 'respclasses' of https://github.com/digitaldisseny/bootstrap into digitaldisseny-respclasses
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/css/bootstrap-responsive.css24
1 files changed, 14 insertions, 10 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 6a420b179..4d104846b 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -57,32 +57,36 @@
display: none !important;
}
+.visible-desktop {
+ display: inherit !important;
+}
+
@media (min-width: 768px) and (max-width: 979px) {
- .visible-tablet {
- display: inherit !important;
- }
- .hidden-tablet {
- display: none !important;
- }
.hidden-desktop {
display: inherit !important;
}
.visible-desktop {
display: none !important ;
}
+ .visible-tablet {
+ display: inherit !important;
+ }
+ .hidden-tablet {
+ display: none !important;
+ }
}
@media (max-width: 767px) {
- .visible-phone {
+ .hidden-desktop {
display: inherit !important;
}
- .hidden-phone {
+ .visible-desktop {
display: none !important;
}
- .hidden-desktop {
+ .visible-phone {
display: inherit !important;
}
- .visible-desktop {
+ .hidden-phone {
display: none !important;
}
}