diff options
| author | Mark Otto <[email protected]> | 2012-01-11 21:59:33 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-11 21:59:33 -0800 |
| commit | 620d987f9f4a6e5d7bcf270159aea10e01d32a35 (patch) | |
| tree | ba4f28d0061aed2585591ed4455fd58169e2adfc /docs/components.html | |
| parent | 32c628725924ca014df208fa57de4c5a4050733e (diff) | |
| parent | 19090ea33322e9d4309497f838f8627ca21734bf (diff) | |
| download | bootstrap-620d987f9f4a6e5d7bcf270159aea10e01d32a35.tar.xz bootstrap-620d987f9f4a6e5d7bcf270159aea10e01d32a35.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
Diffstat (limited to 'docs/components.html')
| -rw-r--r-- | docs/components.html | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/docs/components.html b/docs/components.html index ee1634cca..873bbf682 100644 --- a/docs/components.html +++ b/docs/components.html @@ -147,7 +147,7 @@ <li class="divider"></li> <li><a href="#">Separated link</a></li> </ul> - </div><!-- /btn-group --> + </div><!-- /btn-group --> <div class="btn-group"> <a class="btn primary" href="#">Action</a> <a class="btn primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> @@ -158,7 +158,7 @@ <li class="divider"></li> <li><a href="#">Separated link</a></li> </ul> - </div><!-- /btn-group --> + </div><!-- /btn-group --> <div class="btn-group"> <a class="btn danger" href="#">Danger</a> <a class="btn danger dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> @@ -214,7 +214,7 @@ </div> </div> </section> - + <!-- Nav, Tabs, & Pills @@ -331,7 +331,7 @@ <pre class="prettyprint linenums"> <ul class="nav tabs"> <li class="dropdown"> - <a class="dropdown-toggle" + <a class="dropdown-toggle" data-toggle="dropdown" href="#"> Dropdown @@ -363,7 +363,7 @@ <pre class="prettyprint linenums"> <ul class="nav pills"> <li class="dropdown"> - <a class="dropdown-toggle" + <a class="dropdown-toggle" data-toggle="dropdown" href="#"> Dropdown @@ -483,7 +483,7 @@ <p><a class="btn" href="./javascript.html/#tabs">Get the javascript →</a></p> </div> </div> - + <h3>Straightforward markup</h3> <p>Using tabbable tabs requires a wrapping div, a set of tabs, and a set of tabbable panes of content.</p> <pre class="prettyprint linenums"> @@ -509,7 +509,7 @@ <div class="span4"> <p>Swap the order of your HTML—placing <code>.tabs</code> after <code>.tab-content</code>—for tabs on the bottom.</p> </div> ---> +--> <div class="span4"> <h4>Tabs on the bottom</h4> <p>Flip the order of the HTML and add a class to put tabs on the bottom.</p> @@ -1035,7 +1035,7 @@ </pre> </div> </div><!-- /row --> - + <br> <!-- Block messages --> @@ -1195,7 +1195,7 @@ <script src="../js/bootstrap-dropdown.js"></script> <script src="../js/bootstrap-tab.js"></script> <script src="../js/bootstrap-scrollspy.js"></script> - <script src="../js/bootstrap-twipsy.js"></script> + <script src="../js/bootstrap-tooltip.js"></script> <script src="assets/js/application.js"></script> </body> </html> |