diff options
| author | Mark Otto <[email protected]> | 2013-03-26 12:28:00 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-03-26 12:28:00 -0700 |
| commit | 37ba2824bf01ba5db44b64147212763c5064c764 (patch) | |
| tree | a7c1bfcf56e5657600461e05b00da80cc55438dc | |
| parent | 044b094b22085c9c1972ad961674fffcf770dd12 (diff) | |
| parent | 597d9e8965c71b89543602300474999701f06ab4 (diff) | |
| download | bootstrap-37ba2824bf01ba5db44b64147212763c5064c764.tar.xz bootstrap-37ba2824bf01ba5db44b64147212763c5064c764.zip | |
Merge branch '3.0.0-wip' of https://github.com/psylabs/bootstrap into psylabs-3.0.0-wip
Conflicts:
less/tests/navbar-fixed-top.html
less/tests/navbar-static-top.html
less/tests/navbar.html
| -rw-r--r-- | carousel.html | 6 | ||||
| -rw-r--r-- | jumbotron.html | 4 | ||||
| -rw-r--r-- | starter-template.html | 6 | ||||
| -rw-r--r-- | sticky-footer-navbar.html | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/carousel.html b/carousel.html index eb45fe41e..423fdc6d3 100644 --- a/carousel.html +++ b/carousel.html @@ -56,7 +56,7 @@ body { } /* Offset the responsive button for proper vertical alignment */ -.navbar .btn-navbar { +.navbar .navbar-toggle { margin-top: 10px; } @@ -258,12 +258,12 @@ body { <div class="navbar navbar-inverse"> <div class="navbar-inner"> <!-- Responsive Navbar Part 1: Button for triggering responsive navbar (not covered in tutorial). Include responsive CSS to utilize. --> - <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse"> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="brand" href="#">Project name</a> + <a class="navbar-brand" href="#">Project name</a> <!-- Responsive Navbar Part 2: Place all navbar contents you want collapsed withing .navbar-collapse.collapse. --> <div class="nav-collapse collapse"> <ul class="nav"> diff --git a/jumbotron.html b/jumbotron.html index 907d1413a..fafa53d49 100644 --- a/jumbotron.html +++ b/jumbotron.html @@ -39,12 +39,12 @@ title: Jumbotron template <div class="navbar navbar-inverse navbar-fixed-top"> <div class="container"> - <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <a class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse"> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </a> - <a class="brand" href="#">Project name</a> + <a class="navbar-brand" href="#">Project name</a> <div class="nav-collapse collapse"> <ul class="nav"> <li class="active"><a href="#">Home</a></li> diff --git a/starter-template.html b/starter-template.html index d8cbfdd70..c45c9445e 100644 --- a/starter-template.html +++ b/starter-template.html @@ -18,12 +18,12 @@ title: Starter template <div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> - <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse"> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="brand" href="#">Project name</a> + <a class="navbar-brand" href="#">Project name</a> <div class="nav-collapse collapse"> <ul class="nav"> <li class="active"><a href="#">Home</a></li> @@ -42,4 +42,4 @@ title: Starter template <p class="lead">Use this document as a way to quickly start any new project.<br> All you get is this text and a mostly barebones HTML document.</p> </div> -</div><!-- /container -->
\ No newline at end of file +</div><!-- /container --> diff --git a/sticky-footer-navbar.html b/sticky-footer-navbar.html index 20ce2b4a2..b00bfd5ab 100644 --- a/sticky-footer-navbar.html +++ b/sticky-footer-navbar.html @@ -70,12 +70,12 @@ title: Sticky footer with navbar template <!-- Fixed navbar --> <div class="navbar navbar-fixed-top"> <div class="container"> - <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse"> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="brand" href="#">Project name</a> + <a class="navbar-brand" href="#">Project name</a> <div class="nav-collapse collapse"> <ul class="nav"> <li class="active"><a href="#">Home</a></li> |