diff options
| author | Mark Otto <[email protected]> | 2013-12-03 22:58:25 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-03 22:58:25 -0800 |
| commit | a42e9163cbf6dcdd72a004a4a7c2b787478e18b0 (patch) | |
| tree | 6ba50185884ca0a425d7185ac63949102d96002e /components.html | |
| parent | 303f8a33c354b5c8f6132574de55114b8f39a1f1 (diff) | |
| parent | ed0d556847a7a1168a05a6a71f8f1af23139327b (diff) | |
| download | bootstrap-a42e9163cbf6dcdd72a004a4a7c2b787478e18b0.tar.xz bootstrap-a42e9163cbf6dcdd72a004a4a7c2b787478e18b0.zip | |
Merge branch 'master' into responsive-visibility-table
Conflicts:
dist/css/bootstrap.min.css
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"> |