aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/css/bootstrap-responsive.css
diff options
context:
space:
mode:
authorfat <[email protected]>2013-02-07 22:13:13 -0800
committerfat <[email protected]>2013-02-07 22:13:13 -0800
commit8c7f9c66a7d12f47f50618ef420868fe836d0c33 (patch)
tree552f251d1637a1749c34fcdbb3390653d2fdb8ae /docs/assets/css/bootstrap-responsive.css
parentee91afba63bc6e9687397b9052858fca242c2ff5 (diff)
parentc4d47fb1ea45ed2fc3cf382d087ed87b87c69288 (diff)
downloadbootstrap-2.3.0.tar.xz
bootstrap-2.3.0.zip
Merge branch '2.3.0-wip'v2.3.0
Diffstat (limited to 'docs/assets/css/bootstrap-responsive.css')
-rw-r--r--docs/assets/css/bootstrap-responsive.css31
1 files changed, 24 insertions, 7 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index a3352d774..5215a5d04 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -1,5 +1,5 @@
/*!
- * Bootstrap Responsive v2.2.2
+ * Bootstrap Responsive v2.3.0
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -8,10 +8,6 @@
* Designed and built with all the love in the world @twitter by @mdo and @fat.
*/
-@-ms-viewport {
- width: device-width;
-}
-
.clearfix {
*zoom: 1;
}
@@ -44,6 +40,10 @@
box-sizing: border-box;
}
+@-ms-viewport {
+ width: device-width;
+}
+
.hidden {
display: none;
visibility: hidden;
@@ -95,6 +95,19 @@
}
}
+.visible-print {
+ display: none !important;
+}
+
+@media print {
+ .visible-print {
+ display: inherit !important;
+ }
+ .hidden-print {
+ display: none !important;
+ }
+}
+
@media (min-width: 1200px) {
.row {
margin-left: -30px;
@@ -1003,7 +1016,9 @@
margin-bottom: 2px;
}
.nav-collapse .nav > li > a:hover,
- .nav-collapse .dropdown-menu a:hover {
+ .nav-collapse .nav > li > a:focus,
+ .nav-collapse .dropdown-menu a:hover,
+ .nav-collapse .dropdown-menu a:focus {
background-color: #f2f2f2;
}
.navbar-inverse .nav-collapse .nav > li > a,
@@ -1011,7 +1026,9 @@
color: #999999;
}
.navbar-inverse .nav-collapse .nav > li > a:hover,
- .navbar-inverse .nav-collapse .dropdown-menu a:hover {
+ .navbar-inverse .nav-collapse .nav > li > a:focus,
+ .navbar-inverse .nav-collapse .dropdown-menu a:hover,
+ .navbar-inverse .nav-collapse .dropdown-menu a:focus {
background-color: #111111;
}
.nav-collapse.in .btn-group {