aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-08-17 16:32:34 -0700
committerMark Otto <[email protected]>2012-08-17 16:32:34 -0700
commit1ae194597c3d0a9608803f9edbd05bc50b4844af (patch)
tree63c1d2234118e9adc5e60d0ca64fe2a865910bd3
parent256a25f25c8adc266f9af3099b5143cb49097443 (diff)
downloadbootstrap-1ae194597c3d0a9608803f9edbd05bc50b4844af.tar.xz
bootstrap-1ae194597c3d0a9608803f9edbd05bc50b4844af.zip
nuke subnav styles from responsive navbar
-rw-r--r--docs/assets/css/bootstrap-responsive.css36
-rw-r--r--less/responsive-navbar.less39
2 files changed, 2 insertions, 73 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 56951cfbe..394a15b4a 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -902,8 +902,7 @@
padding-top: 0;
}
.navbar-fixed-top,
- .navbar-fixed-bottom,
- .navbar-subnav-fixed {
+ .navbar-fixed-bottom {
position: static;
}
.navbar-fixed-top {
@@ -1028,39 +1027,6 @@
padding-right: 10px;
padding-left: 10px;
}
- .navbar-subnav {
- width: auto;
- height: auto;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
- }
- .navbar-subnav .navbar-inner {
- background-color: #fff;
- background-image: none;
- }
- .navbar-subnav .nav {
- float: none;
- margin-right: 0;
- }
- .navbar-subnav .nav > li {
- float: none;
- }
- .navbar-subnav .nav > li > a {
- border: 0;
- }
- .navbar-subnav .nav > li > a:hover {
- background-color: #f5f5f5;
- }
- .navbar-subnav .nav > li + li > a {
- border-top: 1px solid #e5e5e5;
- }
- .navbar-subnav .nav > li:first-child > a,
- .navbar-subnav .nav > li:first-child > a:hover {
- -webkit-border-radius: 4px 4px 0 0;
- -moz-border-radius: 4px 4px 0 0;
- border-radius: 4px 4px 0 0;
- }
}
@media (min-width: 980px) {
diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less
index 6d21a99a0..3498863c8 100644
--- a/less/responsive-navbar.less
+++ b/less/responsive-navbar.less
@@ -15,8 +15,7 @@
}
// Unfix the navbars
.navbar-fixed-top,
- .navbar-fixed-bottom,
- .navbar-subnav-fixed {
+ .navbar-fixed-bottom {
position: static;
}
.navbar-fixed-top {
@@ -149,42 +148,6 @@
padding-right: 10px;
}
- // STATIC SUBNAV
- // -------------
- .navbar-subnav {
- width: auto;
- height: auto;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
- }
- .navbar-subnav .navbar-inner {
- background-color: #fff;
- background-image: none; // Remove gradient
- }
- .navbar-subnav .nav {
- float: none;
- margin-right: 0;
- }
- .navbar-subnav .nav > li {
- float: none;
- }
- .navbar-subnav .nav > li > a {
- border: 0;
- }
- .navbar-subnav .nav > li > a:hover {
- background-color: #f5f5f5;
- }
- .navbar-subnav .nav > li + li > a {
- border-top: 1px solid #e5e5e5;
- }
- .navbar-subnav .nav > li:first-child > a,
- .navbar-subnav .nav > li:first-child > a:hover {
- -webkit-border-radius: 4px 4px 0 0;
- -moz-border-radius: 4px 4px 0 0;
- border-radius: 4px 4px 0 0;
- }
-
}