diff options
| author | Mark Otto <[email protected]> | 2013-07-29 12:29:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-29 12:29:22 -0700 |
| commit | d08d9a63c3b61e834d5109069805867dfa841dcf (patch) | |
| tree | 152555fa0886d86efc153c3b3f48e75b60d7dc9d /javascript.html | |
| parent | 7b42b8b0fefa3511862040c58aaaf8f8b6800cbb (diff) | |
| parent | a954f04a02a193959fd9d9c172c5004311a5cca1 (diff) | |
| download | bootstrap-d08d9a63c3b61e834d5109069805867dfa841dcf.tar.xz bootstrap-d08d9a63c3b61e834d5109069805867dfa841dcf.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'javascript.html')
| -rw-r--r-- | javascript.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/javascript.html b/javascript.html index 86aef097d..5229ab6b0 100644 --- a/javascript.html +++ b/javascript.html @@ -963,17 +963,17 @@ $('#myTooltip').on('hidden.bs.tooltip', function () { <h4>Four directions</h4> <div class="bs-example tooltip-demo"> <div class="bs-example-tooltips"> + <button type="button" class="btn btn-default" data-toggle="popover" data-placement="left" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."> + Popover on left + </button> <button type="button" class="btn btn-default" data-toggle="popover" data-placement="top" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."> Popover on top </button> - <button type="button" class="btn btn-default" data-toggle="popover" data-placement="right" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."> - Popover on right - </button> <button type="button" class="btn btn-default" data-toggle="popover" data-placement="bottom" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."> Popover on bottom </button> - <button type="button" class="btn btn-default" data-toggle="popover" data-placement="left" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."> - Popover on left + <button type="button" class="btn btn-default" data-toggle="popover" data-placement="right" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."> + Popover on right </button> </div> </div><!-- /example --> @@ -1218,7 +1218,7 @@ $('#my-alert').bind('closed.bs.alert', function () { </button> </div><!-- /example --> {% highlight html %} -<button type="button" id="fat-btn" data-loading-text="Loading..." class="btn btn-primary"> +<button type="button" data-loading-text="Loading..." class="btn btn-primary"> Loading state </button> {% endhighlight %} |