aboutsummaryrefslogtreecommitdiff
path: root/docs/components
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-08-08 21:37:48 -0700
committerMark Otto <[email protected]>2015-08-08 21:37:48 -0700
commitc6d5fee88aa28cb0e5e6229116869e6fe23ae0a6 (patch)
treeb71bcb3b2a856bb7ae0f816f308de9436983cf80 /docs/components
parent8a92a9ab3b6c9fe6433832f4534672a339924098 (diff)
downloadbootstrap-c6d5fee88aa28cb0e5e6229116869e6fe23ae0a6.tar.xz
bootstrap-c6d5fee88aa28cb0e5e6229116869e6fe23ae0a6.zip
transitions and text changes
Diffstat (limited to 'docs/components')
-rw-r--r--docs/components/popovers.md4
-rw-r--r--docs/components/tooltips.md4
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/components/popovers.md b/docs/components/popovers.md
index 5cc988406..40ae0b4b5 100644
--- a/docs/components/popovers.md
+++ b/docs/components/popovers.md
@@ -4,7 +4,7 @@ title: Popovers
group: components
---
-Add small overlays of content, like those found in iOS, to any element for housing secondary information.
+Add small overlay content, like those found in iOS, to any element for housing secondary information.
## Contents
@@ -23,6 +23,8 @@ Things to know when using the popover plugin:
- Popovers for `.disabled` or `disabled` elements must be triggered on a wrapper element.
- When triggered from hyperlinks that span multiple lines, popovers will be centered. Use `white-space: nowrap;` on your `<a>`s to avoid this behavior.
+Got all that? Great, let's see how they work with some examples.
+
## Example: Enable popovers everywhere
One way to initialize all popovers on a page would be to select them by their `data-toggle` attribute:
diff --git a/docs/components/tooltips.md b/docs/components/tooltips.md
index 2dfa5ae9b..43ed68bda 100644
--- a/docs/components/tooltips.md
+++ b/docs/components/tooltips.md
@@ -4,7 +4,7 @@ title: Tooltips
group: components
---
-Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, use CSS3 for animations, and data-attributes for local title storage.
+Inspired by the excellent Tipsy jQuery plugin written by Jason Frame. Tooltips are an updated version, which don't rely on images, use CSS3 for animations, and data-attributes for local title storage.
## Contents
@@ -22,6 +22,8 @@ Things to know when using the popover plugin:
- Tooltips for `.disabled` or `disabled` elements must be triggered on a wrapper element.
- When triggered from hyperlinks that span multiple lines, tooltips will be centered. Use `white-space: nowrap;` on your `<a>`s to avoid this behavior.
+Got all that? Great, let's see how they work with some examples.
+
## Example: Enable popovers everywhere
One way to initialize all tooltips on a page would be to select them by their `data-toggle` attribute: