aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-01 18:06:57 -0800
committerMark Otto <[email protected]>2013-12-01 18:06:57 -0800
commit33160d50437e1f26e1ddc7d126e528f41a8bc6a0 (patch)
tree8c5ad29378f127522cdb7947da4b873d3f55c933
parent948da5ce9ac46cf0512fbf04ce4be5e38e2e0c6c (diff)
downloadbootstrap-33160d50437e1f26e1ddc7d126e528f41a8bc6a0.tar.xz
bootstrap-33160d50437e1f26e1ddc7d126e528f41a8bc6a0.zip
Fixes #9927: Update non-responsive example to prevent .navbar-collapse border from increasing height and increase specificity of nav selectors to keep dropdowns looking the same
-rw-r--r--examples/non-responsive/non-responsive.css24
1 files changed, 14 insertions, 10 deletions
diff --git a/examples/non-responsive/non-responsive.css b/examples/non-responsive/non-responsive.css
index 526b0b8be..9813bb9fe 100644
--- a/examples/non-responsive/non-responsive.css
+++ b/examples/non-responsive/non-responsive.css
@@ -8,6 +8,7 @@
body {
padding-top: 70px;
padding-bottom: 30px;
+ min-width: 970px;
}
/* Finesse the page header spacing */
@@ -63,6 +64,9 @@ body {
.navbar-toggle {
display: none;
}
+.navbar-collapse {
+ border-top: 0;
+}
.navbar-brand {
margin-left: -15px;
@@ -86,7 +90,7 @@ body {
}
/* Undo custom dropdowns */
-.navbar .open .dropdown-menu {
+.navbar .navbar-nav .open .dropdown-menu {
position: absolute;
float: left;
background-color: #fff;
@@ -97,20 +101,20 @@ body {
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
}
-.navbar .open .dropdown-menu > li > a {
+.navbar-default .navbar-nav .open .dropdown-menu > li > a {
color: #333;
}
-.navbar .open .dropdown-menu > li > a:hover,
-.navbar .open .dropdown-menu > li > a:focus,
-.navbar .open .dropdown-menu > .active > a,
-.navbar .open .dropdown-menu > .active > a:hover,
-.navbar .open .dropdown-menu > .active > a:focus {
+.navbar .navbar-nav .open .dropdown-menu > li > a:hover,
+.navbar .navbar-nav .open .dropdown-menu > li > a:focus,
+.navbar .navbar-nav .open .dropdown-menu > .active > a,
+.navbar .navbar-nav .open .dropdown-menu > .active > a:hover,
+.navbar .navbar-nav .open .dropdown-menu > .active > a:focus {
color: #fff !important;
background-color: #428bca !important;
}
-.navbar .open .dropdown-menu > .disabled > a,
-.navbar .open .dropdown-menu > .disabled > a:hover,
-.navbar .open .dropdown-menu > .disabled > a:focus {
+.navbar .navbar-nav .open .dropdown-menu > .disabled > a,
+.navbar .navbar-nav .open .dropdown-menu > .disabled > a:hover,
+.navbar .navbar-nav .open .dropdown-menu > .disabled > a:focus {
color: #999 !important;
background-color: transparent !important;
}