diff options
| author | Jacob Thornton <[email protected]> | 2013-07-28 22:16:17 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2013-07-28 22:16:17 -0700 |
| commit | a31c5cea422b858f546529009723c4d33dd0d0ea (patch) | |
| tree | d64384b0bd95a6ba608847fa6b8d7b403bac330a /javascript.html | |
| parent | e5a7af36d5a67bb4c3dfa5cc3e9924c3c901d0d3 (diff) | |
| parent | c9c2418a47cc887ea6bacd7783582741267dcd37 (diff) | |
| download | bootstrap-a31c5cea422b858f546529009723c4d33dd0d0ea.tar.xz bootstrap-a31c5cea422b858f546529009723c4d33dd0d0ea.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'javascript.html')
| -rw-r--r-- | javascript.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/javascript.html b/javascript.html index 10e469b44..86aef097d 100644 --- a/javascript.html +++ b/javascript.html @@ -742,10 +742,10 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { <h3>Four directions</h3> <div class="bs-example tooltip-demo"> <div class="bs-example-tooltips"> + <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="Tooltip on left">Tooltip on left</button> <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="top" title="Tooltip on top">Tooltip on top</button> - <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="right" title="Tooltip on right">Tooltip on right</button> <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="bottom" title="Tooltip on bottom">Tooltip on bottom</button> - <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="Tooltip on left">Tooltip on left</button> + <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="right" title="Tooltip on right">Tooltip on right</button> </div> </div><!-- /example --> |