aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-07-04 11:53:55 -0700
committerMark Otto <[email protected]>2017-07-04 11:53:55 -0700
commita662f85398ffe67453c773ec94a94e2607cb4a36 (patch)
tree2ff9a1b3e3513e5d7f2dc7760324b6752b0a425c /docs
parentd785e8a53a8b8783fc0b8c18cb56cea89b6d4396 (diff)
parent2cbaefc2442e2ca3cb25dcea4dd047a25ce7790c (diff)
downloadbootstrap-a662f85398ffe67453c773ec94a94e2607cb4a36.tar.xz
bootstrap-a662f85398ffe67453c773ec94a94e2607cb4a36.zip
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'docs')
-rw-r--r--docs/4.0/components/dropdowns.md2
-rw-r--r--docs/4.0/components/popovers.md2
-rw-r--r--docs/4.0/components/tooltips.md2
-rw-r--r--docs/4.0/utilities/vertical-align.md2
4 files changed, 4 insertions, 4 deletions
diff --git a/docs/4.0/components/dropdowns.md b/docs/4.0/components/dropdowns.md
index 4840e8480..d2e64e536 100644
--- a/docs/4.0/components/dropdowns.md
+++ b/docs/4.0/components/dropdowns.md
@@ -10,7 +10,7 @@ toc: true
Dropdowns are toggleable, contextual overlays for displaying lists of links and more. They're made interactive with the included Bootstrap dropdown JavaScript plugin. They're toggled by clicking, not by hovering; this is [an intentional design decision.](http://markdotto.com/2012/02/27/bootstrap-explained-dropdowns/)
-Dropdowns are built on a third party library, [Popper.js](https://popper.js.org), which provides dynamic positioning and viewport detection. Be sure to include [popper.min.js](https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.10.1/umd/popper.min.js) before Bootstrap's JavaScript.
+Dropdowns are built on a third party library, [Popper.js](https://popper.js.org), which provides dynamic positioning and viewport detection. Be sure to include [popper.min.js](https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.10.8/umd/popper.min.js) before Bootstrap's JavaScript.
## Accessibility
diff --git a/docs/4.0/components/popovers.md b/docs/4.0/components/popovers.md
index 123c3c3be..51b7f7c38 100644
--- a/docs/4.0/components/popovers.md
+++ b/docs/4.0/components/popovers.md
@@ -11,7 +11,7 @@ toc: true
Things to know when using the popover plugin:
-- Popovers rely on the 3rd party library [Popper.js](https://popper.js.org) for positioning. You must include [popper.min.js](https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.10.1/umd/popper.min.js) before bootstrap.js in order for popovers to work!
+- Popovers rely on the 3rd party library [Popper.js](https://popper.js.org) for positioning. You must include [popper.min.js](https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.10.8/umd/popper.min.js) before bootstrap.js in order for popovers to work!
- Popovers require the [tooltip plugin]({{ site.baseurl }}/docs/{{ site.docs_version }}/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/4.0/components/tooltips.md b/docs/4.0/components/tooltips.md
index 7c0bd9f6a..e5c2e0056 100644
--- a/docs/4.0/components/tooltips.md
+++ b/docs/4.0/components/tooltips.md
@@ -10,7 +10,7 @@ toc: true
Things to know when using the tooltip plugin:
-- Tooltips rely on the 3rd party library [Popper.js](https://popper.js.org) for positioning. You must include [popper.min.js](https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.10.1/umd/popper.min.js) before bootstrap.js in order for tooltips to work!
+- Tooltips rely on the 3rd party library [Popper.js](https://popper.js.org) for positioning. You must include [popper.min.js](https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.10.8/umd/popper.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).
diff --git a/docs/4.0/utilities/vertical-align.md b/docs/4.0/utilities/vertical-align.md
index e68498270..3bb4fb851 100644
--- a/docs/4.0/utilities/vertical-align.md
+++ b/docs/4.0/utilities/vertical-align.md
@@ -1,7 +1,7 @@
---
layout: docs
title: Vertical alignment
-description: Easily change the vertical alignment of inlie, inline-block, inline-table, and table cell elements.
+description: Easily change the vertical alignment of inline, inline-block, inline-table, and table cell elements.
group: utilities
---