diff options
| author | Jacob Thornton <[email protected]> | 2012-03-10 12:42:39 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-03-10 12:42:39 -0800 |
| commit | 1fd5e558811a63703e01b6e5e75c44820e59dfc9 (patch) | |
| tree | 3d7f4fd3d55b6d5ef61bbda0a7cf6c2e992be9da /docs | |
| parent | 1a8d7576e091c06662ee94f84d0f3f88a2f2dad8 (diff) | |
| parent | 9ebc6b4c9700610fbc83173c95f5464999f83bff (diff) | |
| download | bootstrap-1fd5e558811a63703e01b6e5e75c44820e59dfc9.tar.xz bootstrap-1fd5e558811a63703e01b6e5e75c44820e59dfc9.zip | |
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 9620 -> 55008 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 18 | ||||
| -rw-r--r-- | docs/assets/css/docs.css | 1 | ||||
| -rw-r--r-- | docs/components.html | 94 | ||||
| -rw-r--r-- | docs/templates/pages/components.mustache | 94 |
5 files changed, 110 insertions, 97 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 502139c25..808f3ff19 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 74ce8db86..a363a7759 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -324,9 +324,9 @@ h4, h5, h6 { margin: 0; - font-family: ''; - font-weight: normal; - color: ''; + font-family: inherit; + font-weight: bold; + color: inherit; text-rendering: optimizelegibility; } h1 small, @@ -1878,6 +1878,18 @@ table .span24 { border-color: #ddd; border-color: rgba(0, 0, 0, 0.15); } +.well-large { + padding: 24px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.well-small { + padding: 9px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} .fade { -webkit-transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index d62ce4beb..26b47ae72 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -63,6 +63,7 @@ hr.soften { .jumbotron h1 { margin-bottom: 9px; font-size: 81px; + font-weight: bold; letter-spacing: -1px; line-height: 1; } diff --git a/docs/components.html b/docs/components.html index a3a389c98..809f4d40e 100644 --- a/docs/components.html +++ b/docs/components.html @@ -134,34 +134,34 @@ <p>Here's how the HTML looks for a standard button group built with anchor tag buttons:</p> <div class=""> <div class="btn-group" style="margin: 9px 0;"> - <a class="btn" href="#">Left</a> - <a class="btn" href="#">Middle</a> - <a class="btn" href="#">Right</a> + <button class="btn">Left</button> + <button class="btn">Middle</button> + <button class="btn">Right</button> </div> </div> <pre class="prettyprint linenums"> <div class="btn-group"> - <a class="btn" href="#">1</a> - <a class="btn" href="#">2</a> - <a class="btn" href="#">3</a> + <button class="btn">1</button> + <button class="btn">2</button> + <button class="btn">3</button> </div> </pre> <h3>Toolbar example</h3> <p>Combine sets of <code><div class="btn-group"></code> into a <code><div class="btn-toolbar"></code> for more complex components.</p> <div class="btn-toolbar"> <div class="btn-group"> - <a class="btn" href="#">1</a> - <a class="btn" href="#">2</a> - <a class="btn" href="#">3</a> - <a class="btn" href="#">4</a> + <button class="btn">1</button> + <button class="btn">2</button> + <button class="btn">3</button> + <button class="btn">4</button> </div> <div class="btn-group"> - <a class="btn" href="#">5</a> - <a class="btn" href="#">6</a> - <a class="btn" href="#">7</a> + <button class="btn">5</button> + <button class="btn">6</button> + <button class="btn">7</button> </div> <div class="btn-group"> - <a class="btn" href="#">8</a> + <button class="btn">8</button> </div> </div> <pre class="prettyprint linenums"> @@ -198,7 +198,7 @@ <p>Use any button to trigger a dropdown menu by placing it within a <code>.btn-group</code> and providing the proper menu markup.</p> <div class="btn-toolbar" style="margin-top: 18px;"> <div class="btn-group"> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">Action <span class="caret"></span></a> + <button class="btn dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> @@ -208,7 +208,7 @@ </ul> </div><!-- /btn-group --> <div class="btn-group"> - <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#">Action <span class="caret"></span></a> + <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> @@ -218,7 +218,7 @@ </ul> </div><!-- /btn-group --> <div class="btn-group"> - <a class="btn btn-danger dropdown-toggle" data-toggle="dropdown" href="#">Danger <span class="caret"></span></a> + <button class="btn btn-danger dropdown-toggle" data-toggle="dropdown">Danger <span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> @@ -230,7 +230,7 @@ </div> <div class="btn-toolbar"> <div class="btn-group"> - <a class="btn btn-warning dropdown-toggle" data-toggle="dropdown" href="#">Warning <span class="caret"></span></a> + <button class="btn btn-warning dropdown-toggle" data-toggle="dropdown">Warning <span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> @@ -240,7 +240,7 @@ </ul> </div><!-- /btn-group --> <div class="btn-group"> - <a class="btn btn-success dropdown-toggle" data-toggle="dropdown" href="#">Success <span class="caret"></span></a> + <button class="btn btn-success dropdown-toggle" data-toggle="dropdown">Success <span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> @@ -250,7 +250,7 @@ </ul> </div><!-- /btn-group --> <div class="btn-group"> - <a class="btn btn-info dropdown-toggle" data-toggle="dropdown" href="#">Info <span class="caret"></span></a> + <button class="btn btn-info dropdown-toggle" data-toggle="dropdown">Info <span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> @@ -260,7 +260,7 @@ </ul> </div><!-- /btn-group --> <div class="btn-group"> - <a class="btn btn-inverse dropdown-toggle" data-toggle="dropdown" href="#">Inverse <span class="caret"></span></a> + <button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">Inverse <span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> @@ -300,8 +300,8 @@ <p>Building on the button group styles and markup, we can easily create a split button. Split buttons feature a standard action on the left and a dropdown toggle on the right with contextual links.</p> <div class="btn-toolbar" style="margin-top: 18px;"> <div class="btn-group"> - <a class="btn" href="#">Action</a> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn">Action</button> + <button class="btn dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> @@ -311,8 +311,8 @@ </ul> </div><!-- /btn-group --> <div class="btn-group"> - <a class="btn btn-primary" href="#">Action</a> - <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn btn-primary">Action</button> + <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> @@ -322,8 +322,8 @@ </ul> </div><!-- /btn-group --> <div class="btn-group"> - <a class="btn btn-danger" href="#">Danger</a> - <a class="btn btn-danger dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn btn-danger">Danger</button> + <button class="btn btn-danger dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> @@ -335,8 +335,8 @@ </div> <div class="btn-toolbar"> <div class="btn-group"> - <a class="btn btn-warning" href="#">Warning</a> - <a class="btn btn-warning dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn btn-warning">Warning</button> + <button class="btn btn-warning dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> @@ -346,8 +346,8 @@ </ul> </div><!-- /btn-group --> <div class="btn-group"> - <a class="btn btn-success" href="#">Success</a> - <a class="btn btn-success dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn btn-success">Success</button> + <button class="btn btn-success dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> @@ -357,8 +357,8 @@ </ul> </div><!-- /btn-group --> <div class="btn-group"> - <a class="btn btn-info" href="#">Info</a> - <a class="btn btn-info dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn btn-info">Info</button> + <button class="btn btn-info dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> @@ -370,8 +370,8 @@ </div> <div class="btn-toolbar"> <div class="btn-group"> - <a class="btn btn-inverse" href="#">Inverse</a> - <a class="btn btn-inverse dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn btn-inverse">Inverse</button> + <button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> @@ -385,8 +385,8 @@ <p>Add <code>.pull-right</code> to the <code>.dropdown-menu</code> of any button dropdown for right aligned menus.</p> <div class="btn-toolbar"> <div class="btn-group"> - <a class="btn" href="#">Right</a> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn">Right</button> + <button class="btn dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu pull-right"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> @@ -410,10 +410,10 @@ <p>We expand on the normal button dropdowns to provide a second button action that operates as a separate dropdown trigger.</p> <pre class="prettyprint linenums"> <div class="btn-group"> - <a class="btn" href="#">Action</a> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> + <button class="btn">Action</button> + <button class="btn dropdown-toggle" data-toggle="dropdown"> <span class="caret"></span> - </a> + </button> <ul class="dropdown-menu"> <!-- dropdown menu links --> </ul> @@ -423,8 +423,8 @@ <p>Dropdown menus can also be toggled from the bottom up by adding a single class to the immediate parent of <code>.dropdown-menu</code>. It will flip the direction of the <code>.caret</code> and reposition the menu itself to move from the bottom up instead of top down.</p> <div class="btn-toolbar" style="margin-top: 9px;"> <div class="btn-group dropup"> - <a class="btn" href="#">Dropup</a> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn">Dropup</button> + <button class="btn dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> @@ -434,8 +434,8 @@ </ul> </div><!-- /btn-group --> <div class="btn-group dropup"> - <a class="btn primary" href="#">Right dropup</a> - <a class="btn primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn primary">Right dropup</button> + <button class="btn primary dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu pull-right"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> @@ -447,10 +447,10 @@ </div> <pre class="prettyprint linenums"> <div class="btn-group dropup"> - <a class="btn" href="#">Dropup</a> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> + <button class="btn">Dropup</button> + <button class="btn dropdown-toggle" data-toggle="dropdown"> <span class="caret"></span> - </a> + </button> <ul class="dropdown-menu"> <!-- dropdown menu links --> </ul> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index f38969567..354c4d54d 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -58,34 +58,34 @@ <p>{{_i}}Here's how the HTML looks for a standard button group built with anchor tag buttons:{{/i}}</p> <div class=""> <div class="btn-group" style="margin: 9px 0;"> - <a class="btn" href="#">{{_i}}Left{{/i}}</a> - <a class="btn" href="#">{{_i}}Middle{{/i}}</a> - <a class="btn" href="#">{{_i}}Right{{/i}}</a> + <button class="btn">{{_i}}Left{{/i}}</button> + <button class="btn">{{_i}}Middle{{/i}}</button> + <button class="btn">{{_i}}Right{{/i}}</button> </div> </div> <pre class="prettyprint linenums"> <div class="btn-group"> - <a class="btn" href="#">1</a> - <a class="btn" href="#">2</a> - <a class="btn" href="#">3</a> + <button class="btn">1</button> + <button class="btn">2</button> + <button class="btn">3</button> </div> </pre> <h3>{{_i}}Toolbar example{{/i}}</h3> <p>{{_i}}Combine sets of <code><div class="btn-group"></code> into a <code><div class="btn-toolbar"></code> for more complex components.{{/i}}</p> <div class="btn-toolbar"> <div class="btn-group"> - <a class="btn" href="#">1</a> - <a class="btn" href="#">2</a> - <a class="btn" href="#">3</a> - <a class="btn" href="#">4</a> + <button class="btn">1</button> + <button class="btn">2</button> + <button class="btn">3</button> + <button class="btn">4</button> </div> <div class="btn-group"> - <a class="btn" href="#">5</a> - <a class="btn" href="#">6</a> - <a class="btn" href="#">7</a> + <button class="btn">5</button> + <button class="btn">6</button> + <button class="btn">7</button> </div> <div class="btn-group"> - <a class="btn" href="#">8</a> + <button class="btn">8</button> </div> </div> <pre class="prettyprint linenums"> @@ -122,7 +122,7 @@ <p>{{_i}}Use any button to trigger a dropdown menu by placing it within a <code>.btn-group</code> and providing the proper menu markup.{{/i}}</p> <div class="btn-toolbar" style="margin-top: 18px;"> <div class="btn-group"> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Action{{/i}} <span class="caret"></span></a> + <button class="btn dropdown-toggle" data-toggle="dropdown">{{_i}}Action{{/i}} <span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li> @@ -132,7 +132,7 @@ </ul> </div><!-- /btn-group --> <div class="btn-group"> - <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Action{{/i}} <span class="caret"></span></a> + <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">{{_i}}Action{{/i}} <span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li> @@ -142,7 +142,7 @@ </ul> </div><!-- /btn-group --> <div class="btn-group"> - <a class="btn btn-danger dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Danger{{/i}} <span class="caret"></span></a> + <button class="btn btn-danger dropdown-toggle" data-toggle="dropdown">{{_i}}Danger{{/i}} <span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li> @@ -154,7 +154,7 @@ </div> <div class="btn-toolbar"> <div class="btn-group"> - <a class="btn btn-warning dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Warning{{/i}} <span class="caret"></span></a> + <button class="btn btn-warning dropdown-toggle" data-toggle="dropdown">{{_i}}Warning{{/i}} <span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li> @@ -164,7 +164,7 @@ </ul> </div><!-- /btn-group --> <div class="btn-group"> - <a class="btn btn-success dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Success{{/i}} <span class="caret"></span></a> + <button class="btn btn-success dropdown-toggle" data-toggle="dropdown">{{_i}}Success{{/i}} <span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li> @@ -174,7 +174,7 @@ </ul> </div><!-- /btn-group --> <div class="btn-group"> - <a class="btn btn-info dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Info{{/i}} <span class="caret"></span></a> + <button class="btn btn-info dropdown-toggle" data-toggle="dropdown">{{_i}}Info{{/i}} <span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li> @@ -184,7 +184,7 @@ </ul> </div><!-- /btn-group --> <div class="btn-group"> - <a class="btn btn-inverse dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Inverse{{/i}} <span class="caret"></span></a> + <button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">{{_i}}Inverse{{/i}} <span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li> @@ -224,8 +224,8 @@ <p>{{_i}}Building on the button group styles and markup, we can easily create a split button. Split buttons feature a standard action on the left and a dropdown toggle on the right with contextual links.{{/i}}</p> <div class="btn-toolbar" style="margin-top: 18px;"> <div class="btn-group"> - <a class="btn" href="#">{{_i}}Action{{/i}}</a> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn">{{_i}}Action{{/i}}</button> + <button class="btn dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li> @@ -235,8 +235,8 @@ </ul> </div><!-- /btn-group --> <div class="btn-group"> - <a class="btn btn-primary" href="#">{{_i}}Action{{/i}}</a> - <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn btn-primary">{{_i}}Action{{/i}}</button> + <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li> @@ -246,8 +246,8 @@ </ul> </div><!-- /btn-group --> <div class="btn-group"> - <a class="btn btn-danger" href="#">{{_i}}Danger{{/i}}</a> - <a class="btn btn-danger dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn btn-danger">{{_i}}Danger{{/i}}</button> + <button class="btn btn-danger dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li> @@ -259,8 +259,8 @@ </div> <div class="btn-toolbar"> <div class="btn-group"> - <a class="btn btn-warning" href="#">{{_i}}Warning{{/i}}</a> - <a class="btn btn-warning dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn btn-warning">{{_i}}Warning{{/i}}</button> + <button class="btn btn-warning dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li> @@ -270,8 +270,8 @@ </ul> </div><!-- /btn-group --> <div class="btn-group"> - <a class="btn btn-success" href="#">{{_i}}Success{{/i}}</a> - <a class="btn btn-success dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn btn-success">{{_i}}Success{{/i}}</button> + <button class="btn btn-success dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li> @@ -281,8 +281,8 @@ </ul> </div><!-- /btn-group --> <div class="btn-group"> - <a class="btn btn-info" href="#">{{_i}}Info{{/i}}</a> - <a class="btn btn-info dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn btn-info">{{_i}}Info{{/i}}</button> + <button class="btn btn-info dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li> @@ -294,8 +294,8 @@ </div> <div class="btn-toolbar"> <div class="btn-group"> - <a class="btn btn-inverse" href="#">{{_i}}Inverse{{/i}}</a> - <a class="btn btn-inverse dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn btn-inverse">{{_i}}Inverse{{/i}}</button> + <button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li> @@ -309,8 +309,8 @@ <p>{{_i}}Add <code>.pull-right</code> to the <code>.dropdown-menu</code> of any button dropdown for right aligned menus.{{/i}}</p> <div class="btn-toolbar"> <div class="btn-group"> - <a class="btn" href="#">{{_i}}Right{{/i}}</a> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn">{{_i}}Right{{/i}}</button> + <button class="btn dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu pull-right"> <li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li> @@ -334,10 +334,10 @@ <p>{{_i}}We expand on the normal button dropdowns to provide a second button action that operates as a separate dropdown trigger.{{/i}}</p> <pre class="prettyprint linenums"> <div class="btn-group"> - <a class="btn" href="#">{{_i}}Action{{/i}}</a> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> + <button class="btn">{{_i}}Action{{/i}}</button> + <button class="btn dropdown-toggle" data-toggle="dropdown"> <span class="caret"></span> - </a> + </button> <ul class="dropdown-menu"> <!-- {{_i}}dropdown menu links{{/i}} --> </ul> @@ -347,8 +347,8 @@ <p>{{_i}}Dropdown menus can also be toggled from the bottom up by adding a single class to the immediate parent of <code>.dropdown-menu</code>. It will flip the direction of the <code>.caret</code> and reposition the menu itself to move from the bottom up instead of top down.{{/i}}</p> <div class="btn-toolbar" style="margin-top: 9px;"> <div class="btn-group dropup"> - <a class="btn" href="#">{{_i}}Dropup{{/i}}</a> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn">{{_i}}Dropup{{/i}}</button> + <button class="btn dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li> @@ -358,8 +358,8 @@ </ul> </div><!-- /btn-group --> <div class="btn-group dropup"> - <a class="btn primary" href="#">{{_i}}Right dropup{{/i}}</a> - <a class="btn primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <button class="btn primary">{{_i}}Right dropup{{/i}}</button> + <button class="btn primary dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <ul class="dropdown-menu pull-right"> <li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li> @@ -371,10 +371,10 @@ </div> <pre class="prettyprint linenums"> <div class="btn-group dropup"> - <a class="btn" href="#">{{_i}}Dropup{{/i}}</a> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> + <button class="btn">{{_i}}Dropup{{/i}}</button> + <button class="btn dropdown-toggle" data-toggle="dropdown"> <span class="caret"></span> - </a> + </button> <ul class="dropdown-menu"> <!-- {{_i}}dropdown menu links{{/i}} --> </ul> |
