aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-08-17 00:12:58 -0700
committerMark Otto <[email protected]>2015-08-17 00:12:58 -0700
commit461b37b034f3683fbe561091530a79615c4f9369 (patch)
treeb81839b5d37fb87a8d0e700718a7d31b160c820a /docs
parentbce36ae0262d01e7403570d3e29b0eba9985b865 (diff)
parent409ede0a35b9147f4f57013f898aacdfbb3a2adc (diff)
downloadbootstrap-461b37b034f3683fbe561091530a79615c4f9369.tar.xz
bootstrap-461b37b034f3683fbe561091530a79615c4f9369.zip
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Diffstat (limited to 'docs')
-rw-r--r--docs/components/popovers.md2
-rw-r--r--docs/components/tooltips.md1
2 files changed, 3 insertions, 0 deletions
diff --git a/docs/components/popovers.md b/docs/components/popovers.md
index c5f374a97..2b0b26bb7 100644
--- a/docs/components/popovers.md
+++ b/docs/components/popovers.md
@@ -15,6 +15,8 @@ Add small overlay content, like those found in iOS, to any element for housing s
Things to know when using the popover plugin:
+
+- Popovers rely on on the 3rd party library [tehter](http://github.hubspot.com/tether/) for positioning. You must include [tether.min.js](https://github.com/HubSpot/tether/blob/master/dist/js/tether.min.js) before bootstrap.js in order for popovers to work!
- Popovers require the [tooltip plugin](/components/tooltips) as a dependency.
- Popovers are opt-in for performance reasons, so **you must initialize them yourself**.
- Zero-length `title` and `content` values will never show a popover.
diff --git a/docs/components/tooltips.md b/docs/components/tooltips.md
index bdaa56139..3881a8e03 100644
--- a/docs/components/tooltips.md
+++ b/docs/components/tooltips.md
@@ -15,6 +15,7 @@ Inspired by the excellent Tipsy jQuery plugin written by Jason Frame. Tooltips a
Things to know when using the tooltip plugin:
+- Tooltips rely on on the 3rd party library [tehter](http://github.hubspot.com/tether/) for positioning. You must include [tether.min.js](https://github.com/HubSpot/tether/blob/master/dist/js/tether.min.js) before bootstrap.js in order for tooltips to work!
- Tooltips are opt-in for performance reasons, so **you must initialize them yourself**.
- Tooltips with zero-length titles are never displayed.
- Specify `container: 'body'` to avoid rendering problems in more complex components (like our input groups, button groups, etc).