diff options
| author | Mark Otto <[email protected]> | 2014-09-17 15:21:31 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-09-17 15:21:31 -0700 |
| commit | 9f2aeafe851bdca522b886c29afcece1ee0060e1 (patch) | |
| tree | be13d5ce0d68631543f28af8d9b444a7bd44917e /docs/examples/theme/index.html | |
| parent | 7d9f55c3d5dcc5b12882af96245dab27be5fa346 (diff) | |
| parent | c5c67d0f54674dede58fc924d4d7c0f1d65705d9 (diff) | |
| download | bootstrap-9f2aeafe851bdca522b886c29afcece1ee0060e1.tar.xz bootstrap-9f2aeafe851bdca522b886c29afcece1ee0060e1.zip | |
Merge branch 'master' into derp
Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/fonts/glyphicons-halflings-regular.svg
docs/_includes/components/badges.html
docs/_includes/components/input-groups.html
docs/_includes/components/pagination.html
docs/_includes/css/forms.html
docs/_includes/footer.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/grunt.html
docs/_includes/home-nav.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/_includes/nav/getting-started.html
docs/_includes/nav/javascript.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/fonts/glyphicons-halflings-regular.svg
fonts/glyphicons-halflings-regular.svg
less/_button-group.less
less/_jumbotron.less
less/_variables.less
less/mixins/vendor-prefixes.less
less/panels.less
less/thumbnails.less
package.json
Diffstat (limited to 'docs/examples/theme/index.html')
| -rw-r--r-- | docs/examples/theme/index.html | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/examples/theme/index.html b/docs/examples/theme/index.html index 54bf85346..7b817f4b9 100644 --- a/docs/examples/theme/index.html +++ b/docs/examples/theme/index.html @@ -25,10 +25,10 @@ <body role="document"> <!-- Fixed navbar --> - <div class="navbar navbar-inverse navbar-fixed-top" role="navigation"> + <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="container"> <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> @@ -36,7 +36,7 @@ </button> <a class="navbar-brand" href="#">Bootstrap theme</a> </div> - <div class="navbar-collapse collapse"> + <div id="navbar" class="navbar-collapse collapse"> <ul class="nav navbar-nav"> <li class="active"><a href="#">Home</a></li> <li><a href="#about">About</a></li> @@ -56,7 +56,7 @@ </ul> </div><!--/.nav-collapse --> </div> - </div> + </nav> <div class="container theme-showcase" role="main"> @@ -371,7 +371,7 @@ <h1>Navbars</h1> </div> - <div class="navbar navbar-default"> + <nav class="navbar navbar-default"> <div class="container"> <div class="navbar-header"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> @@ -402,9 +402,9 @@ </ul> </div><!--/.nav-collapse --> </div> - </div> + </nav> - <div class="navbar navbar-inverse"> + <nav class="navbar navbar-inverse"> <div class="container"> <div class="navbar-header"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> @@ -435,7 +435,7 @@ </ul> </div><!--/.nav-collapse --> </div> - </div> + </nav> |