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 /carousel.html | |
| 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
Diffstat (limited to 'carousel.html')
| -rw-r--r-- | carousel.html | 6 |
1 files changed, 3 insertions, 3 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"> |