diff options
| author | Mark Otto <[email protected]> | 2013-02-01 10:34:25 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-01 10:34:25 -0800 |
| commit | e4aa1fcef4e4a7b9830ff13a204170478695c1bb (patch) | |
| tree | cbaad65bc59f6413b42410650b4d084d6d53c0fd /carousel.html | |
| parent | ce497ae73088ecec492a5de2a2ae5a460ba27fbc (diff) | |
| parent | cc58a65fa125f119af713db5d92413c093503ce4 (diff) | |
| download | bootstrap-e4aa1fcef4e4a7b9830ff13a204170478695c1bb.tar.xz bootstrap-e4aa1fcef4e4a7b9830ff13a204170478695c1bb.zip | |
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/examples/hero.html
docs/examples/sticky-footer-navbar.html
Diffstat (limited to 'carousel.html')
| -rw-r--r-- | carousel.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/carousel.html b/carousel.html index 50f34e648..81d1a28a1 100644 --- a/carousel.html +++ b/carousel.html @@ -279,11 +279,11 @@ <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. --> - <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> - </a> + </button> <a class="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"> |