Merge pull request #9403 from twbs/bs3_navbar_overhaul

BS3: Navbar overhaul

1 files changed, 210 insertions, 69 deletions

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 682b6d530..12ff99380 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2410,6 +2410,10 @@ textarea.input-group-lg > .input-group-btn > .btn {
   position: relative;
 }
 
+.dropdown-toggle:focus {
+  outline: 0;
+}
+
 .dropdown-menu {
   position: absolute;
   top: 100%;
@@ -3087,11 +3091,9 @@ button.close {
 .navbar {
   position: relative;
   min-height: 50px;
-  padding-right: 15px;
-  padding-left: 15px;
   margin-bottom: 20px;
-  background-color: #eeeeee;
-  border-radius: 4px;
+  background-color: #f8f8f8;
+  border: 1px solid #e7e7e7;
 }
 
 .navbar:before,
@@ -3114,104 +3116,119 @@ button.close {
   clear: both;
 }
 
-.navbar-nav > li > a {
-  padding-top: 15px;
-  padding-bottom: 15px;
-  line-height: 20px;
-  color: #777777;
-  border-radius: 4px;
+@media (min-width: 768px) {
+  .navbar {
+    border-radius: 4px;
+  }
 }
 
-.navbar-nav > li > a:hover,
-.navbar-nav > li > a:focus {
-  color: #333333;
-  background-color: transparent;
+.navbar-header {
+  padding-right: 15px;
+  padding-left: 15px;
 }
 
-.navbar-nav > .active > a,
-.navbar-nav > .active > a:hover,
-.navbar-nav > .active > a:focus {
-  color: #555555;
-  background-color: #d5d5d5;
+.navbar-header:before,
+.navbar-header:after {
+  display: table;
+  content: " ";
 }
 
-.navbar-nav > .disabled > a,
-.navbar-nav > .disabled > a:hover,
-.navbar-nav > .disabled > a:focus {
-  color: #cccccc;
-  background-color: transparent;
+.navbar-header:after {
+  clear: both;
 }
 
-.navbar-nav.pull-right {
-  width: 100%;
+.navbar-header:before,
+.navbar-header:after {
+  display: table;
+  content: " ";
 }
 
-.navbar-static-top {
-  border-radius: 0;
+.navbar-header:after {
+  clear: both;
 }
 
-.navbar-fixed-top,
-.navbar-fixed-bottom {
-  position: fixed;
-  right: 0;
-  left: 0;
-  z-index: 1030;
-  border-radius: 0;
+@media (min-width: 768px) {
+  .navbar-header {
+    float: left;
+  }
 }
 
-.navbar-fixed-top {
-  top: 0;
+.navbar-collapse {
+  max-height: 360px;
+  padding: 5px 15px;
+  overflow-x: visible;
+  overflow-y: scroll;
+  border-top: 1px solid #e6e6e6;
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
+  -webkit-overflow-scrolling: touch;
 }
 
-.navbar-fixed-bottom {
-  bottom: 0;
-  margin-bottom: 0;
+.navbar-collapse:before,
+.navbar-collapse:after {
+  display: table;
+  content: " ";
 }
 
-.nav-collapse {
-  padding-bottom: 15px;
+.navbar-collapse:after {
   clear: both;
 }
 
-.nav-collapse:before,
-.nav-collapse:after {
+.navbar-collapse:before,
+.navbar-collapse:after {
   display: table;
   content: " ";
 }
 
-.nav-collapse:after {
+.navbar-collapse:after {
   clear: both;
 }
 
-.nav-collapse:before,
-.nav-collapse:after {
-  display: table;
-  content: " ";
+@media (min-width: 768px) {
+  .navbar-collapse {
+    width: auto;
+    padding-top: 0;
+    padding-bottom: 0;
+    border-top: 0;
+  }
 }
 
-.nav-collapse:after {
-  clear: both;
+@media (min-width: 768px) {
+  .navbar-static-top {
+    border-width: 0 0 1px;
+    border-radius: 0;
+  }
 }
 
-.navbar-toggle + .nav-collapse {
-  width: 100%;
-  margin-top: 50px;
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  position: fixed;
+  right: 0;
+  left: 0;
+  z-index: 1030;
+  border-width: 0 0 1px;
 }
 
-@media (max-width: 768px) {
-  .nav-collapse-scrollable {
-    max-height: 360px;
-    margin-bottom: 15px;
-    overflow-y: scroll;
-    -webkit-overflow-scrolling: touch;
+@media (min-width: 768px) {
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    border-radius: 0;
   }
 }
 
+.navbar-fixed-top {
+  top: 0;
+}
+
+.navbar-fixed-bottom {
+  bottom: 0;
+  margin-bottom: 0;
+}
+
 .navbar-brand {
   float: left;
   padding-top: 15px;
   padding-bottom: 15px;
-  margin-right: 15px;
+  margin-right: 7.5px;
   font-size: 18px;
   line-height: 20px;
   color: #777777;
@@ -3229,7 +3246,6 @@ button.close {
   float: right;
   padding: 9px 10px;
   margin-top: 8px;
-  margin-right: -10px;
   margin-bottom: 8px;
   background-color: transparent;
   border: 1px solid #dddddd;
@@ -3253,9 +3269,94 @@ button.close {
   margin-top: 4px;
 }
 
+.navbar-nav {
+  margin-right: -15px;
+  margin-left: -15px;
+}
+
+@media (min-width: 768px) {
+  .navbar-nav {
+    margin-right: 0;
+    margin-left: 0;
+  }
+}
+
+.navbar-nav > li > a {
+  padding-top: 10px;
+  padding-bottom: 10px;
+  line-height: 20px;
+  color: #777777;
+}
+
+.navbar-nav > li > a:hover,
+.navbar-nav > li > a:focus {
+  color: #333333;
+  background-color: transparent;
+}
+
+.navbar-nav > .active > a,
+.navbar-nav > .active > a:hover,
+.navbar-nav > .active > a:focus {
+  color: #555555;
+  background-color: #e7e7e7;
+}
+
+.navbar-nav > .disabled > a,
+.navbar-nav > .disabled > a:hover,
+.navbar-nav > .disabled > a:focus {
+  color: #cccccc;
+  background-color: transparent;
+}
+
+.navbar-nav.pull-right {
+  width: 100%;
+}
+
+@media (max-width: 767px) {
+  .navbar-nav .open .dropdown-menu {
+    position: static;
+    float: none;
+    width: auto;
+    margin-top: 0;
+    background-color: transparent;
+    border: 0;
+    box-shadow: none;
+  }
+  .navbar-nav .open .dropdown-menu > li > a,
+  .navbar-nav .open .dropdown-menu .dropdown-header {
+    padding: 5px 15px 5px 25px;
+  }
+  .navbar-nav .open .dropdown-menu > li > a {
+    line-height: 20px;
+    color: #777777;
+  }
+  .navbar-nav .open .dropdown-menu > li > a:hover,
+  .navbar-nav .open .dropdown-menu > li > a:focus {
+    color: #333333;
+    background-color: transparent;
+    background-image: none;
+  }
+  .navbar-nav .open .dropdown-menu > .active > a,
+  .navbar-nav .open .dropdown-menu > .active > a:hover,
+  .navbar-nav .open .dropdown-menu > .active > a:focus {
+    color: #555555;
+    background-color: #e7e7e7;
+  }
+  .navbar-nav .open .dropdown-menu > .disabled > a,
+  .navbar-nav .open .dropdown-menu > .disabled > a:hover,
+  .navbar-nav .open .dropdown-menu > .disabled > a:focus {
+    color: #cccccc;
+    background-color: transparent;
+  }
+}
+
 .navbar-form {
+  width: 100%;
+  padding: 10px 15px;
   margin-top: 8px;
   margin-bottom: 8px;
+  border-top: 1px solid #e6e6e6;
+  border-bottom: 1px solid #e6e6e6;
 }
 
 @media (min-width: 768px) {
@@ -3281,6 +3382,21 @@ button.close {
   }
 }
 
+@media (max-width: 767px) {
+  .navbar-form .form-group {
+    margin-bottom: 5px;
+  }
+}
+
+@media (min-width: 768px) {
+  .navbar-form {
+    width: auto;
+    padding-top: 0;
+    padding-bottom: 0;
+    border: 0;
+  }
+}
+
 .navbar-nav > li > .dropdown-menu {
   margin-top: 0;
   border-top-right-radius: 0;
@@ -3302,7 +3418,7 @@ button.close {
 .navbar-nav > .open > a:hover,
 .navbar-nav > .open > a:focus {
   color: #555555;
-  background-color: #d5d5d5;
+  background-color: #e7e7e7;
 }
 
 .navbar-nav > .open > a .caret,
@@ -3325,6 +3441,7 @@ button.close {
 
 .navbar-inverse {
   background-color: #222222;
+  border-color: #080808;
 }
 
 .navbar-inverse .navbar-brand {
@@ -3378,6 +3495,10 @@ button.close {
   background-color: #ffffff;
 }
 
+.navbar-inverse .navbar-collapse {
+  border-top-color: #101010;
+}
+
 .navbar-inverse .navbar-nav > .open > a,
 .navbar-inverse .navbar-nav > .open > a:hover,
 .navbar-inverse .navbar-nav > .open > a:focus {
@@ -3402,10 +3523,30 @@ button.close {
   border-bottom-color: #ffffff;
 }
 
-@media screen and (min-width: 768px) {
-  .nav-collapse {
-    clear: none;
+@media (max-width: 767px) {
+  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
+    color: #999999;
+  }
+  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
+    color: #ffffff;
+    background-color: transparent;
+  }
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus {
+    color: #ffffff;
+    background-color: #080808;
+  }
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus {
+    color: #444444;
+    background-color: transparent;
   }
+}
+
+@media screen and (min-width: 768px) {
   .navbar-nav {
     float: left;
     margin-top: 0;
@@ -3415,7 +3556,8 @@ button.close {
     float: left;
   }
   .navbar-nav > li > a {
-    border-radius: 0;
+    padding-top: 15px;
+    padding-bottom: 15px;
   }
   .navbar-nav.pull-right {
     width: auto;
@@ -3426,7 +3568,7 @@ button.close {
     left: auto;
     display: none;
   }
-  .nav-collapse.collapse {
+  .navbar-collapse.collapse {
     display: block !important;
     height: auto !important;
     padding-bottom: 0;
@@ -3440,7 +3582,6 @@ button.close {
 
 .navbar-text {
   float: left;
-  padding: 0 15px;
   margin-top: 15px;
   margin-bottom: 15px;
 }