aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJohann-S <[email protected]>2017-05-24 14:27:15 +0200
committerJohann-S <[email protected]>2017-05-24 14:57:40 +0200
commit9e894991b01dd76ee32a90d5c91629b62e2d23e5 (patch)
treea0c6af29f365aac02de945e316fce8d8c37cd263 /docs
parent4c3b6c5ceb8eda2f0c3f23317d5862248c6d6f9b (diff)
downloadbootstrap-9e894991b01dd76ee32a90d5c91629b62e2d23e5.tar.xz
bootstrap-9e894991b01dd76ee32a90d5c91629b62e2d23e5.zip
Update documentation for Tooltips/Popovers about auto placement
Diffstat (limited to 'docs')
-rw-r--r--docs/components/popovers.md2
-rw-r--r--docs/components/tooltips.md2
-rw-r--r--docs/migration.md8
3 files changed, 2 insertions, 10 deletions
diff --git a/docs/components/popovers.md b/docs/components/popovers.md
index 4574197dd..dc966e5a3 100644
--- a/docs/components/popovers.md
+++ b/docs/components/popovers.md
@@ -221,7 +221,7 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
<td>string | function</td>
<td>'right'</td>
<td>
- <p>How to position the popover - top | bottom | left | right.</p>
+ <p>How to position the popover - auto | top | bottom | left | right.<br>When <code>auto</code> is specified, it will dynamically reorient the popover.</p>
<p>When a function is used to determine the placement, it is called with the popover DOM node as its first argument and the triggering element DOM node as its second. The <code>this</code> context is set to the popover instance.</p>
</td>
</tr>
diff --git a/docs/components/tooltips.md b/docs/components/tooltips.md
index 865e709e4..d48d8535e 100644
--- a/docs/components/tooltips.md
+++ b/docs/components/tooltips.md
@@ -200,7 +200,7 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
<td>string | function</td>
<td>'top'</td>
<td>
- <p>How to position the tooltip - top | bottom | left | right.</p>
+ <p>How to position the tooltip - auto | top | bottom | left | right.<br>When <code>auto</code> is specified, it will dynamically reorient the tooltip.</p>
<p>When a function is used to determine the placement, it is called with the tooltip DOM node as its first argument and the triggering element DOM node as its second. The <code>this</code> context is set to the tooltip instance.</p>
</td>
</tr>
diff --git a/docs/migration.md b/docs/migration.md
index 2584a22e8..37b9ce391 100644
--- a/docs/migration.md
+++ b/docs/migration.md
@@ -196,14 +196,6 @@ Dropped entirely for the new card component.
- `.panel-warning` to `.card-warning` and `.card-inverse` (or use `.bg-warning` on `.card-header`)
- `.panel-danger` to `.card-danger` and `.card-inverse` (or use `.bg-danger` on `.card-header`)
-### Tooltips
-
-- Removed support for `auto` placement options.
-
-### Popovers
-
-- Removed support for `auto` placement options.
-
### Carousel
- Overhauled the entire component to simplify design and styling. We have fewer styles for you to override, new indicators, and new icons.