aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--assets/css/docs.css6
-rw-r--r--assets/js/application.js2
-rw-r--r--javascript.html12
3 files changed, 7 insertions, 13 deletions
diff --git a/assets/css/docs.css b/assets/css/docs.css
index 0991aca3d..d1240bcb0 100644
--- a/assets/css/docs.css
+++ b/assets/css/docs.css
@@ -493,12 +493,6 @@ body {
/* Tooltips */
.bs-example-tooltips {
text-align: center;
- margin: 0 0 10px;
- list-style: none;
-}
-.bs-example-tooltips li {
- display: inline;
- padding: 0 10px;
}
/* Popovers */
diff --git a/assets/js/application.js b/assets/js/application.js
index 3fa5f07b7..9e6813958 100644
--- a/assets/js/application.js
+++ b/assets/js/application.js
@@ -29,7 +29,7 @@
// tooltip demo
$('.tooltip-demo').tooltip({
- selector: "a[data-toggle=tooltip]"
+ selector: "[data-toggle=tooltip]"
})
$('.tooltip-test').tooltip()
diff --git a/javascript.html b/javascript.html
index 23fe67719..2fb5b334f 100644
--- a/javascript.html
+++ b/javascript.html
@@ -747,12 +747,12 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
<h3>Four directions</h3>
<div class="bs-example tooltip-demo">
- <ul class="bs-example-tooltips">
- <li><a href="#" data-toggle="tooltip" data-placement="top" title="Tooltip on top">Tooltip on top</a></li>
- <li><a href="#" data-toggle="tooltip" data-placement="right" title="Tooltip on right">Tooltip on right</a></li>
- <li><a href="#" data-toggle="tooltip" data-placement="bottom" title="Tooltip on bottom">Tooltip on bottom</a></li>
- <li><a href="#" data-toggle="tooltip" data-placement="left" title="Tooltip on left">Tooltip on left</a></li>
- </ul>
+ <div class="bs-example-tooltips">
+ <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>
+ </div>
</div><!-- /example -->
<div class="bs-callout bs-callout-info">