aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-04-17 16:52:44 -0700
committerMark Otto <[email protected]>2016-04-17 16:52:44 -0700
commitf4d80ff6b4d90663f071e57ceb4238a179ab4f31 (patch)
tree0496f556821f0a8c8ae4fbb091272c46d67ec43b /docs
parent24d6a03f5d61d563bce54dead6b432a4146ce080 (diff)
parent0d5b6aa4e8ad24f77c5d777fe0fa27da3601c9ee (diff)
downloadbootstrap-f4d80ff6b4d90663f071e57ceb4238a179ab4f31.tar.xz
bootstrap-f4d80ff6b4d90663f071e57ceb4238a179ab4f31.zip
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'docs')
-rw-r--r--docs/_data/browser-bugs.yml10
-rw-r--r--docs/components/collapse.md2
2 files changed, 1 insertions, 11 deletions
diff --git a/docs/_data/browser-bugs.yml b/docs/_data/browser-bugs.yml
index 94b9773b4..728466ab7 100644
--- a/docs/_data/browser-bugs.yml
+++ b/docs/_data/browser-bugs.yml
@@ -232,16 +232,6 @@
browser: >
Safari (OS X)
summary: >
- Scrollbar clipped in `select[multiple]` with padding.
- upstream_bug: >
- WebKit#128489, Safari#19208483
- origin: >
- Bootstrap#12536
-
--
- browser: >
- Safari (OS X)
- summary: >
Weird button behavior with some `<input type="number">` elements.
upstream_bug: >
WebKit#137269, Safari#18834768
diff --git a/docs/components/collapse.md b/docs/components/collapse.md
index 57e3cd829..e328e589e 100644
--- a/docs/components/collapse.md
+++ b/docs/components/collapse.md
@@ -86,7 +86,7 @@ Extend the default collapse behavior to create an accordion.
Be sure to add `aria-expanded` to the control element. This attribute explicitly defines the current state of the collapsible element to screen readers and similar assistive technologies. If the collapsible element is closed by default, it should have a value of `aria-expanded="false"`. If you've set the collapsible element to be open by default using the `in` class, set `aria-expanded="true"` on the control instead. The plugin will automatically toggle this attribute based on whether or not the collapsible element has been opened or closed.
-Additionally, if your control element is targetting a single collapsible element – i.e. the `data-target` attribute is pointing to an `id` selector – you may add an additional `aria-controls` attribute to the control element, containing the `id` of the collapsible element. Modern screen readers and similar assistive technologies make use of this attribute to provide users with additional shortcuts to navigate directly to the collapsible element itself.
+Additionally, if your control element is targeting a single collapsible element – i.e. the `data-target` attribute is pointing to an `id` selector – you may add an additional `aria-controls` attribute to the control element, containing the `id` of the collapsible element. Modern screen readers and similar assistive technologies make use of this attribute to provide users with additional shortcuts to navigate directly to the collapsible element itself.
## Usage