Skip to content

B
bootstrap
Commit 9482a5f8 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge pull request #9403 from twbs/bs3_navbar_overhaul 

BS3: Navbar overhaul
parents a8769b8c bd93ed2c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 686 additions and 462 deletions
_includes/nav-components.html
View file @ 9482a5f8
...@@ -52,9 +52,7 @@ ...@@ -52,9 +52,7 @@
<li> <li>
<a href="#navbar">Navbar</a> <a href="#navbar">Navbar</a>
<ul class="nav"> <ul class="nav">
<li><a href="#navbar-basic">Basic navbar</a></li> <li><a href="#navbar-default">Default navbar</a></li>
<li><a href="#navbar-nav">Nav links</a></li>
<li><a href="#navbar-forms">Forms in navbars</a></li>
<li><a href="#navbar-buttons">Buttons in navbars</a></li> <li><a href="#navbar-buttons">Buttons in navbars</a></li>
<li><a href="#navbar-text">Text in navbars</a></li> <li><a href="#navbar-text">Text in navbars</a></li>
<li><a href="#navbar-links">Links in navbars</a></li> <li><a href="#navbar-links">Links in navbars</a></li>
...@@ -62,8 +60,6 @@ ...@@ -62,8 +60,6 @@
<li><a href="#navbar-fixed-top">Fixed top navbar</a></li> <li><a href="#navbar-fixed-top">Fixed top navbar</a></li>
<li><a href="#navbar-fixed-bottom">Fixed bottom navbar</a></li> <li><a href="#navbar-fixed-bottom">Fixed bottom navbar</a></li>
<li><a href="#navbar-static-top">Static top navbar</a></li> <li><a href="#navbar-static-top">Static top navbar</a></li>
<li><a href="#navbar-responsive">Responsive navbar</a></li>
<li><a href="#navbar-scrollable">Scrollable responsive navbar</a></li>
<li><a href="#navbar-inverted">Inverted navbar</a></li> <li><a href="#navbar-inverted">Inverted navbar</a></li>
</ul> </ul>
</li> </li>
......
_includes/nav-main.html
View file @ 9482a5f8
<header class="navbar navbar-inverse navbar-fixed-top bs-docs-nav" role="banner"> <header class="navbar navbar-inverse navbar-fixed-top bs-docs-nav" role="banner">
<div class="container"> <div class="container">
<button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse"> <div class="navbar-header">
<span class="sr-only">Toggle navigation</span> <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse">
<span class="icon-bar"></span> <span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> <span class="icon-bar"></span>
<a href="{{ page.base_url }}" class="navbar-brand">Bootstrap 3 RC2</a> </button>
<nav class="nav-collapse collapse bs-navbar-collapse" role="navigation"> <a href="{{ page.base_url }}" class="navbar-brand">Bootstrap 3 RC2</a>
</div>
<nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li{% if page.slug == "getting-started" %} class="active"{% endif %}> <li{% if page.slug == "getting-started" %} class="active"{% endif %}>
<a href="{{ page.base_url }}getting-started">Getting started</a> <a href="{{ page.base_url }}getting-started">Getting started</a>
......
assets/css/docs.css
View file @ 9482a5f8
...@@ -56,6 +56,9 @@ body { ...@@ -56,6 +56,9 @@ body {
.bs-docs-nav { .bs-docs-nav {
background-color: #563d7c; background-color: #563d7c;
} }
.bs-docs-nav .navbar-collapse {
border-color: #463265;
}
.bs-docs-nav .navbar-brand { .bs-docs-nav .navbar-brand {
color: #fff; color: #fff;
} }
...@@ -385,11 +388,10 @@ body { ...@@ -385,11 +388,10 @@ body {
} }
/* Tweak display of the examples */ /* Tweak display of the examples */
.bs-example + .prettyprint,
.bs-example + .highlight { .bs-example + .highlight {
margin-top: 0; margin: 0 -15px;
border-top-left-radius: 0; border-radius: 0;
border-top-right-radius: 0; border-width: 0 0 1px;
} }
/* Tweak content of examples for optimum awesome */ /* Tweak content of examples for optimum awesome */
...@@ -799,6 +801,15 @@ body { ...@@ -799,6 +801,15 @@ body {
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
box-shadow: none; box-shadow: none;
} }
.bs-example + .prettyprint,
.bs-example + .highlight {
margin-top: 0;
margin-left: 0;
margin-right: 0;
border-width: 1px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
}
.carbonad { .carbonad {
margin: 0 !important; margin: 0 !important;
......
components.html
View file @ 9482a5f8
This diff is collapsed.
dist/css/bootstrap.css
View file @ 9482a5f8
...@@ -2410,6 +2410,10 @@ textarea.input-group-lg > .input-group-btn > .btn { ...@@ -2410,6 +2410,10 @@ textarea.input-group-lg > .input-group-btn > .btn {
position: relative; position: relative;
} }
.dropdown-toggle:focus {
outline: 0;
}
.dropdown-menu { .dropdown-menu {
position: absolute; position: absolute;
top: 100%; top: 100%;
...@@ -3087,11 +3091,9 @@ button.close { ...@@ -3087,11 +3091,9 @@ button.close {
.navbar { .navbar {
position: relative; position: relative;
min-height: 50px; min-height: 50px;
padding-right: 15px;
padding-left: 15px;
margin-bottom: 20px; margin-bottom: 20px;
background-color: #eeeeee; background-color: #f8f8f8;
border-radius: 4px; border: 1px solid #e7e7e7;
} }
.navbar:before, .navbar:before,
...@@ -3114,104 +3116,119 @@ button.close { ...@@ -3114,104 +3116,119 @@ button.close {
clear: both; clear: both;
} }
.navbar-nav > li > a { @media (min-width: 768px) {
padding-top: 15px; .navbar {
padding-bottom: 15px; border-radius: 4px;
line-height: 20px; }
color: #777777;
border-radius: 4px;
} }
.navbar-nav > li > a:hover, .navbar-header {
.navbar-nav > li > a:focus { padding-right: 15px;
color: #333333; padding-left: 15px;
background-color: transparent;
} }
.navbar-nav > .active > a, .navbar-header:before,
.navbar-nav > .active > a:hover, .navbar-header:after {
.navbar-nav > .active > a:focus { display: table;
color: #555555; content: " ";
background-color: #d5d5d5;
} }
.navbar-nav > .disabled > a, .navbar-header:after {
.navbar-nav > .disabled > a:hover, clear: both;
.navbar-nav > .disabled > a:focus {
color: #cccccc;
background-color: transparent;
} }
.navbar-nav.pull-right { .navbar-header:before,
width: 100%; .navbar-header:after {
display: table;
content: " ";
} }
.navbar-static-top { .navbar-header:after {
border-radius: 0; clear: both;
} }
.navbar-fixed-top, @media (min-width: 768px) {
.navbar-fixed-bottom { .navbar-header {
position: fixed; float: left;
right: 0; }
left: 0;
z-index: 1030;
border-radius: 0;
} }
.navbar-fixed-top { .navbar-collapse {
top: 0; 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 { .navbar-collapse:before,
bottom: 0; .navbar-collapse:after {
margin-bottom: 0; display: table;
content: " ";
} }
.nav-collapse { .navbar-collapse:after {
padding-bottom: 15px;
clear: both; clear: both;
} }
.nav-collapse:before, .navbar-collapse:before,
.nav-collapse:after { .navbar-collapse:after {
display: table; display: table;
content: " "; content: " ";
} }
.nav-collapse:after { .navbar-collapse:after {
clear: both; clear: both;
} }
.nav-collapse:before, @media (min-width: 768px) {
.nav-collapse:after { .navbar-collapse {
display: table; width: auto;
content: " "; padding-top: 0;
padding-bottom: 0;
border-top: 0;
}
} }
.nav-collapse:after { @media (min-width: 768px) {
clear: both; .navbar-static-top {
border-width: 0 0 1px;
border-radius: 0;
}
} }
.navbar-toggle + .nav-collapse { .navbar-fixed-top,
width: 100%; .navbar-fixed-bottom {
margin-top: 50px; position: fixed;
right: 0;
left: 0;
z-index: 1030;
border-width: 0 0 1px;
} }
@media (max-width: 768px) { @media (min-width: 768px) {
.nav-collapse-scrollable { .navbar-fixed-top,
max-height: 360px; .navbar-fixed-bottom {
margin-bottom: 15px; border-radius: 0;
overflow-y: scroll;
-webkit-overflow-scrolling: touch;
} }
} }
.navbar-fixed-top {
top: 0;
}
.navbar-fixed-bottom {
bottom: 0;
margin-bottom: 0;
}
.navbar-brand { .navbar-brand {
float: left; float: left;
padding-top: 15px; padding-top: 15px;
padding-bottom: 15px; padding-bottom: 15px;
margin-right: 15px; margin-right: 7.5px;
font-size: 18px; font-size: 18px;
line-height: 20px; line-height: 20px;
color: #777777; color: #777777;
...@@ -3229,7 +3246,6 @@ button.close { ...@@ -3229,7 +3246,6 @@ button.close {
float: right; float: right;
padding: 9px 10px; padding: 9px 10px;
margin-top: 8px; margin-top: 8px;
margin-right: -10px;
margin-bottom: 8px; margin-bottom: 8px;
background-color: transparent; background-color: transparent;
border: 1px solid #dddddd; border: 1px solid #dddddd;
...@@ -3253,9 +3269,94 @@ button.close { ...@@ -3253,9 +3269,94 @@ button.close {
margin-top: 4px; 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 { .navbar-form {
width: 100%;
padding: 10px 15px;
margin-top: 8px; margin-top: 8px;
margin-bottom: 8px; margin-bottom: 8px;
border-top: 1px solid #e6e6e6;
border-bottom: 1px solid #e6e6e6;
} }
@media (min-width: 768px) { @media (min-width: 768px) {
...@@ -3281,6 +3382,21 @@ button.close { ...@@ -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 { .navbar-nav > li > .dropdown-menu {
margin-top: 0; margin-top: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
...@@ -3302,7 +3418,7 @@ button.close { ...@@ -3302,7 +3418,7 @@ button.close {
.navbar-nav > .open > a:hover, .navbar-nav > .open > a:hover,
.navbar-nav > .open > a:focus { .navbar-nav > .open > a:focus {
color: #555555; color: #555555;
background-color: #d5d5d5; background-color: #e7e7e7;
} }
.navbar-nav > .open > a .caret, .navbar-nav > .open > a .caret,
...@@ -3325,6 +3441,7 @@ button.close { ...@@ -3325,6 +3441,7 @@ button.close {
.navbar-inverse { .navbar-inverse {
background-color: #222222; background-color: #222222;
border-color: #080808;
} }
.navbar-inverse .navbar-brand { .navbar-inverse .navbar-brand {
...@@ -3378,6 +3495,10 @@ button.close { ...@@ -3378,6 +3495,10 @@ button.close {
background-color: #ffffff; background-color: #ffffff;
} }
.navbar-inverse .navbar-collapse {
border-top-color: #101010;
}
.navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a,
.navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:hover,
.navbar-inverse .navbar-nav > .open > a:focus { .navbar-inverse .navbar-nav > .open > a:focus {
...@@ -3402,10 +3523,30 @@ button.close { ...@@ -3402,10 +3523,30 @@ button.close {
border-bottom-color: #ffffff; border-bottom-color: #ffffff;
} }
@media screen and (min-width: 768px) { @media (max-width: 767px) {
.nav-collapse { .navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
clear: none; 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 { .navbar-nav {
float: left; float: left;
margin-top: 0; margin-top: 0;
...@@ -3415,7 +3556,8 @@ button.close { ...@@ -3415,7 +3556,8 @@ button.close {
float: left; float: left;
} }
.navbar-nav > li > a { .navbar-nav > li > a {
border-radius: 0; padding-top: 15px;
padding-bottom: 15px;
} }
.navbar-nav.pull-right { .navbar-nav.pull-right {
width: auto; width: auto;
...@@ -3426,7 +3568,7 @@ button.close { ...@@ -3426,7 +3568,7 @@ button.close {
left: auto; left: auto;
display: none; display: none;
} }
.nav-collapse.collapse { .navbar-collapse.collapse {
display: block !important; display: block !important;
height: auto !important; height: auto !important;
padding-bottom: 0; padding-bottom: 0;
...@@ -3440,7 +3582,6 @@ button.close { ...@@ -3440,7 +3582,6 @@ button.close {
.navbar-text { .navbar-text {
float: left; float: left;
padding: 0 15px;
margin-top: 15px; margin-top: 15px;
margin-bottom: 15px; margin-bottom: 15px;
} }
......
dist/css/bootstrap.min.css
View file @ 9482a5f8
This source diff could not be displayed because it is too large. You can view the blob instead.
less/dropdowns.less
View file @ 9482a5f8
...@@ -21,6 +21,11 @@ ...@@ -21,6 +21,11 @@
position: relative; position: relative;
} }
// Prevent the focus on the dropdown toggle when closing dropdowns
.dropdown-toggle:focus {
outline: 0;
}
// The dropdown menu (ul) // The dropdown menu (ul)
.dropdown-menu { .dropdown-menu {
position: absolute; position: absolute;
......
less/navbar.less
View file @ 9482a5f8
This diff is collapsed.
less/variables.less
View file @ 9482a5f8
...@@ -231,9 +231,10 @@ ...@@ -231,9 +231,10 @@
// Basics of a navbar // Basics of a navbar
@navbar-height: 50px; @navbar-height: 50px;
@navbar-color: #777;
@navbar-bg: #eee;
@navbar-margin-bottom: @line-height-computed; @navbar-margin-bottom: @line-height-computed;
@navbar-color: #777;
@navbar-bg: #f8f8f8;
@navbar-border: darken(@navbar-bg, 6.5%);
@navbar-border-radius: @border-radius-base; @navbar-border-radius: @border-radius-base;
@navbar-padding-horizontal: floor(@grid-gutter-width / 2); @navbar-padding-horizontal: floor(@grid-gutter-width / 2);
@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
...@@ -243,7 +244,7 @@ ...@@ -243,7 +244,7 @@
@navbar-link-hover-color: #333; @navbar-link-hover-color: #333;
@navbar-link-hover-bg: transparent; @navbar-link-hover-bg: transparent;
@navbar-link-active-color: #555; @navbar-link-active-color: #555;
@navbar-link-active-bg: darken(@navbar-bg, 10%); @navbar-link-active-bg: darken(@navbar-bg, 6.5%);
@navbar-link-disabled-color: #ccc; @navbar-link-disabled-color: #ccc;
@navbar-link-disabled-bg: transparent; @navbar-link-disabled-bg: transparent;
...@@ -263,6 +264,7 @@ ...@@ -263,6 +264,7 @@
// Reset inverted navbar basics // Reset inverted navbar basics
@navbar-inverse-color: @gray-light; @navbar-inverse-color: @gray-light;
@navbar-inverse-bg: #222; @navbar-inverse-bg: #222;
@navbar-inverse-border: darken(@navbar-inverse-bg, 10%);
// Inverted navbar links // Inverted navbar links
@navbar-inverse-link-color: @gray-light; @navbar-inverse-link-color: @gray-light;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment