diff options
| author | Mark Otto <[email protected]> | 2013-12-04 21:23:09 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-04 21:23:09 -0800 |
| commit | cf81cb60ef9e29fd5b97c7a7d213dbf80cad0be6 (patch) | |
| tree | 9d05ca6eb1fb77bb9b854d37c7ed5d178c02d0a9 /components.html | |
| parent | 3f1e4b92eefaee617115973eba98fc7cc0905ab8 (diff) | |
| parent | 8c5dc542a553d93d4ee26db176e515f5164be8a7 (diff) | |
| download | bootstrap-cf81cb60ef9e29fd5b97c7a7d213dbf80cad0be6.tar.xz bootstrap-cf81cb60ef9e29fd5b97c7a7d213dbf80cad0be6.zip | |
Merge branch 'master' into gradient-prefix-cleanup
Conflicts:
dist/css/bootstrap.min.css
docs-assets/js/raw-files.js
Diffstat (limited to 'components.html')
| -rw-r--r-- | components.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components.html b/components.html index 457398078..8653149ff 100644 --- a/components.html +++ b/components.html @@ -1171,7 +1171,7 @@ base_url: "../" <a class="btn btn-default" role="button">Left</a> <a class="btn btn-default" role="button">Middle</a> <div class="btn-group"> - <a type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> + <a class="btn btn-default dropdown-toggle" data-toggle="dropdown"> Right dropdown <span class="caret"></span> </a> <ul class="dropdown-menu" role="menu"> |