diff options
| author | Mark Otto <[email protected]> | 2012-02-19 16:00:54 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-19 16:00:54 -0800 |
| commit | f4f34ab12f0f89e6a11f6b752ab82fb01bd746d4 (patch) | |
| tree | 1fd89eb7715f4acff7e48a077fcd5413e39f0079 /docs/templates | |
| parent | 59d570fc160c71dc21f77735e9d14797e247d859 (diff) | |
| parent | 1e6d386b8df2d7235b23a96ddd0489c1ab2650dc (diff) | |
| download | bootstrap-f4f34ab12f0f89e6a11f6b752ab82fb01bd746d4.tar.xz bootstrap-f4f34ab12f0f89e6a11f6b752ab82fb01bd746d4.zip | |
Merge branch 'andriijas-2.0.1-wip' into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/templates')
| -rw-r--r-- | docs/templates/pages/components.mustache | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 39c9020d2..dcf5212a8 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -172,6 +172,16 @@ <li><a href="#">{{_i}}Separated link{{/i}}</a></li> </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> + <ul class="dropdown-menu"> + <li><a href="#">{{_i}}Action{{/i}}</a></li> + <li><a href="#">{{_i}}Another action{{/i}}</a></li> + <li><a href="#">{{_i}}Something else here{{/i}}</a></li> + <li class="divider"></li> + <li><a href="#">{{_i}}Separated link{{/i}}</a></li> + </ul> + </div><!-- /btn-group --> </div><!-- /btn-toolbar --> <hr> <p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}}Button dropdowns require the <a href="./javascript.html#dropdowns">Bootstrap dropdown plugin</a> to function.{{/i}}</p> @@ -255,6 +265,17 @@ <li><a href="#">{{_i}}Separated link{{/i}}</a></li> </ul> </div><!-- /btn-group --> + <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> + <ul class="dropdown-menu"> + <li><a href="#">{{_i}}Action{{/i}}</a></li> + <li><a href="#">{{_i}}Another action{{/i}}</a></li> + <li><a href="#">{{_i}}Something else here{{/i}}</a></li> + <li class="divider"></li> + <li><a href="#">{{_i}}Separated link{{/i}}</a></li> + </ul> + </div><!-- /btn-group --> </div> </div> <div class="span8"> @@ -1077,6 +1098,14 @@ <code><span class="label label-info">{{_i}}Info{{/i}}</span></code> </td> </tr> + <tr> + <td> + <span class="label label-inverse">{{_i}}Inverse{{/i}}</span> + </td> + <td> + <code><span class="label label-inverse">{{_i}}Inverse{{/i}}</span></code> + </td> + </tr> </tbody> </table> </section> |