diff options
| author | Mark Otto <[email protected]> | 2013-08-13 13:53:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-13 13:53:27 -0700 |
| commit | 9482a5f8128db47bbed1378cbc9cd9c8a57fb2ce (patch) | |
| tree | 2a59b9815cb02226a694c345cf942c9ad869810f /_includes | |
| parent | a8769b8cab1799168b31f1a5afd403f323a6b6d4 (diff) | |
| parent | bd93ed2cb6034de2f287f7508b4fd0b1d28ab0d3 (diff) | |
| download | bootstrap-9482a5f8128db47bbed1378cbc9cd9c8a57fb2ce.tar.xz bootstrap-9482a5f8128db47bbed1378cbc9cd9c8a57fb2ce.zip | |
Merge pull request #9403 from twbs/bs3_navbar_overhaul
BS3: Navbar overhaul
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/nav-components.html | 6 | ||||
| -rw-r--r-- | _includes/nav-main.html | 18 |
2 files changed, 11 insertions, 13 deletions
diff --git a/_includes/nav-components.html b/_includes/nav-components.html index c9cb2729d..dcb4374ef 100644 --- a/_includes/nav-components.html +++ b/_includes/nav-components.html @@ -52,9 +52,7 @@ <li> <a href="#navbar">Navbar</a> <ul class="nav"> - <li><a href="#navbar-basic">Basic 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-default">Default navbar</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-links">Links in navbars</a></li> @@ -62,8 +60,6 @@ <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-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> </ul> </li> diff --git a/_includes/nav-main.html b/_includes/nav-main.html index 6250c2b8d..197bad2d8 100644 --- a/_includes/nav-main.html +++ b/_includes/nav-main.html @@ -1,13 +1,15 @@ <header class="navbar navbar-inverse navbar-fixed-top bs-docs-nav" role="banner"> <div class="container"> - <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a href="{{ page.base_url }}" class="navbar-brand">Bootstrap 3 RC2</a> - <nav class="nav-collapse collapse bs-navbar-collapse" role="navigation"> + <div class="navbar-header"> + <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <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"> <li{% if page.slug == "getting-started" %} class="active"{% endif %}> <a href="{{ page.base_url }}getting-started">Getting started</a> |