From: Mark Otto <otto@github.com>
Date: Fri, 1 Feb 2013 18:34:25 +0000 (-0800)
Subject: Merge branch '2.3.0-wip' into 3.0.0-wip
X-Git-Tag: v3.0.0~81^2~11^2~1^2~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4aa1fcef4e4a7b9830ff13a204170478695c1bb;p=thirdparty%2Fbootstrap.git

Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
	docs/examples/hero.html
	docs/examples/sticky-footer-navbar.html
---

e4aa1fcef4e4a7b9830ff13a204170478695c1bb
diff --cc sticky-footer-navbar.html
index 13e14ee9ad,a9027c8c28..c700ed2cab
--- a/sticky-footer-navbar.html
+++ b/sticky-footer-navbar.html
@@@ -92,32 -89,34 +92,32 @@@
  
        <!-- Fixed navbar -->
        <div class="navbar navbar-fixed-top">
 -        <div class="navbar-inner">
 -          <div class="container">
 -            <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>
 -            </button>
 -            <a class="brand" href="#">Project name</a>
 -            <div class="nav-collapse collapse">
 -              <ul class="nav">
 -                <li class="active"><a href="#">Home</a></li>
 -                <li><a href="#about">About</a></li>
 -                <li><a href="#contact">Contact</a></li>
 -                <li class="dropdown">
 -                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
 -                  <ul class="dropdown-menu">
 -                    <li><a href="#">Action</a></li>
 -                    <li><a href="#">Another action</a></li>
 -                    <li><a href="#">Something else here</a></li>
 -                    <li class="divider"></li>
 -                    <li class="nav-header">Nav header</li>
 -                    <li><a href="#">Separated link</a></li>
 -                    <li><a href="#">One more separated link</a></li>
 -                  </ul>
 -                </li>
 -              </ul>
 -            </div><!--/.nav-collapse -->
 -          </div>
 +        <div class="container">
-           <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>
 +          <div class="nav-collapse collapse">
 +            <ul class="nav">
 +              <li class="active"><a href="#">Home</a></li>
 +              <li><a href="#about">About</a></li>
 +              <li><a href="#contact">Contact</a></li>
 +              <li class="dropdown">
 +                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
 +                <ul class="dropdown-menu">
 +                  <li><a href="#">Action</a></li>
 +                  <li><a href="#">Another action</a></li>
 +                  <li><a href="#">Something else here</a></li>
 +                  <li class="divider"></li>
 +                  <li class="nav-header">Nav header</li>
 +                  <li><a href="#">Separated link</a></li>
 +                  <li><a href="#">One more separated link</a></li>
 +                </ul>
 +              </li>
 +            </ul>
 +          </div><!--/.nav-collapse -->
          </div>
        </div>