diff options
| author | Mark Otto <[email protected]> | 2013-07-26 19:50:02 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-26 19:50:02 -0700 |
| commit | d16396f44ab01b3da09851302036019bb880d5c7 (patch) | |
| tree | 1c8bfa64c89056fb75fbb58f732877995bfff905 | |
| parent | 20040868c120f00889ee835a0b250551607d24b7 (diff) | |
| download | bootstrap-d16396f44ab01b3da09851302036019bb880d5c7.tar.xz bootstrap-d16396f44ab01b3da09851302036019bb880d5c7.zip | |
Fix broke ass popovers direction example
| -rw-r--r-- | assets/js/application.js | 5 | ||||
| -rw-r--r-- | javascript.html | 20 |
2 files changed, 15 insertions, 10 deletions
diff --git a/assets/js/application.js b/assets/js/application.js index 99ba1413d..95fc7b7fe 100644 --- a/assets/js/application.js +++ b/assets/js/application.js @@ -69,11 +69,8 @@ }) // popover demo - $("a[data-toggle=popover]") + $("[data-toggle=popover]") .popover() - .click(function(e) { - e.preventDefault() - }) // button state demo $('#fat-btn') diff --git a/javascript.html b/javascript.html index f54a21523..213f32778 100644 --- a/javascript.html +++ b/javascript.html @@ -924,12 +924,20 @@ $('#example').tooltip(options) <h4>Four directions</h4> <div class="bs-example tooltip-demo"> - <ul class="bs-example-tooltips"> - <li><a href="#" class="btn btn-default" data-toggle="popover" data-placement="top" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on top">Popover on top</a></li> - <li><a href="#" class="btn btn-default" data-toggle="popover" data-placement="right" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on right">Popover on right</a></li> - <li><a href="#" class="btn btn-default" data-toggle="popover" data-placement="bottom" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on bottom">Popover on bottom</a></li> - <li><a href="#" class="btn btn-default" data-toggle="popover" data-placement="left" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on left">Popover on left</a></li> - </ul> + <div class="bs-example-tooltips"> + <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> + </div> </div><!-- /example --> |