From bf39bb3ac3d2aef4687b3cd4762015d5f218e2bc Mon Sep 17 00:00:00 2001 From: Starsam80 Date: Thu, 27 Oct 2016 16:13:17 -0600 Subject: Rename `.active` to `.show` --- docs/components/collapse.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/components/collapse.md') diff --git a/docs/components/collapse.md b/docs/components/collapse.md index 0ece9e453..5b3430118 100644 --- a/docs/components/collapse.md +++ b/docs/components/collapse.md @@ -18,7 +18,7 @@ Click the buttons below to show and hide another element via class changes: - `.collapse` hides content - `.collapsing` is applied during transitions -- `.collapse.active` shows content +- `.collapse.show` shows content You can use a link with the `href` attribute, or a button with the `data-target` attribute. In both cases, the `data-toggle="collapse"` is required. @@ -53,7 +53,7 @@ Extend the default collapse behavior to create an accordion. -
+
Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
@@ -101,14 +101,14 @@ Additionally, if your control element is targeting a single collapsible element The collapse plugin utilizes a few classes to handle the heavy lifting: - `.collapse` hides the content -- `.collapse.active` shows the content +- `.collapse.show` shows the content - `.collapsing` is added when the transition starts, and removed when it finishes These classes can be found in `_animation.scss`. ### Via data attributes -Just add `data-toggle="collapse"` and a `data-target` to the element to automatically assign control of a collapsible element. The `data-target` attribute accepts a CSS selector to apply the collapse to. Be sure to add the class `collapse` to the collapsible element. If you'd like it to default open, add the additional class `active`. +Just add `data-toggle="collapse"` and a `data-target` to the element to automatically assign control of a collapsible element. The `data-target` attribute accepts a CSS selector to apply the collapse to. Be sure to add the class `collapse` to the collapsible element. If you'd like it to default open, add the additional class `show`. To add accordion-like group management to a collapsible control, add the data attribute `data-parent="#selector"`. Refer to the demo to see this in action. -- cgit v1.2.3 From 7e5f21c2b4e5d28b75f58de1509699eaa49c4872 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 19 Dec 2016 21:37:09 -0800 Subject: Rename _animation.scss to _transitions.scss (#21370) * Rename _animation.scss to _transitions.scss for accuracy * fix docs reference to file name * cleanup line breaks --- docs/components/collapse.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/components/collapse.md') diff --git a/docs/components/collapse.md b/docs/components/collapse.md index 0ece9e453..3e465319e 100644 --- a/docs/components/collapse.md +++ b/docs/components/collapse.md @@ -104,7 +104,7 @@ The collapse plugin utilizes a few classes to handle the heavy lifting: - `.collapse.active` shows the content - `.collapsing` is added when the transition starts, and removed when it finishes -These classes can be found in `_animation.scss`. +These classes can be found in `_transitions.scss`. ### Via data attributes -- cgit v1.2.3 From ff8d28cf2501773ff6f7833865c8e2b2ebb76a3f Mon Sep 17 00:00:00 2001 From: Quy Date: Sat, 31 Dec 2016 16:12:28 -0800 Subject: Move .table-responsive from wrapper to .table --- docs/components/collapse.md | 108 +++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 56 deletions(-) (limited to 'docs/components/collapse.md') diff --git a/docs/components/collapse.md b/docs/components/collapse.md index e3172fa75..11017c234 100644 --- a/docs/components/collapse.md +++ b/docs/components/collapse.md @@ -124,32 +124,30 @@ $('.collapse').collapse() Options can be passed via data attributes or JavaScript. For data attributes, append the option name to `data-`, as in `data-parent=""`. -
- - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDefaultDescription
parentselectorfalseIf a selector is provided, then all collapsible elements under the specified parent will be closed when this collapsible item is shown. (similar to traditional accordion behavior - this is dependent on the panel class)
togglebooleantrueToggles the collapsible element on invocation
-
+ + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDefaultDescription
parentselectorfalseIf a selector is provided, then all collapsible elements under the specified parent will be closed when this collapsible item is shown. (similar to traditional accordion behavior - this is dependent on the panel class)
togglebooleantrueToggles the collapsible element on invocation
### Methods @@ -179,36 +177,34 @@ Hides a collapsible element. Bootstrap's collapse class exposes a few events for hooking into collapse functionality. -
- - - - - - - - - - - - - - - - - - - - - - - - - -
Event TypeDescription
show.bs.collapseThis event fires immediately when the show instance method is called.
shown.bs.collapseThis event is fired when a collapse element has been made visible to the user (will wait for CSS transitions to complete).
hide.bs.collapse - This event is fired immediately when the hide method has been called. -
hidden.bs.collapseThis event is fired when a collapse element has been hidden from the user (will wait for CSS transitions to complete).
-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Event TypeDescription
show.bs.collapseThis event fires immediately when the show instance method is called.
shown.bs.collapseThis event is fired when a collapse element has been made visible to the user (will wait for CSS transitions to complete).
hide.bs.collapse + This event is fired immediately when the hide method has been called. +
hidden.bs.collapseThis event is fired when a collapse element has been hidden from the user (will wait for CSS transitions to complete).
{% highlight js %} $('#myCollapsible').on('hidden.bs.collapse', function () { -- cgit v1.2.3 From c2ff9b73870057b0d5aec0d067313ba61671dd6e Mon Sep 17 00:00:00 2001 From: Quy Date: Sun, 1 Jan 2017 12:00:55 -0800 Subject: Change .in to .show (#21500) --- docs/components/collapse.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/components/collapse.md') diff --git a/docs/components/collapse.md b/docs/components/collapse.md index 11017c234..f48efd9cc 100644 --- a/docs/components/collapse.md +++ b/docs/components/collapse.md @@ -92,7 +92,7 @@ Extend the default collapse behavior to create an accordion. ## Accessibility -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. +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 `show` 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 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. -- cgit v1.2.3 From 6b48ba4e0d1f83c541d9a21c1235dc55968b6290 Mon Sep 17 00:00:00 2001 From: "Patrick H. Lauke" Date: Wed, 11 Jan 2017 23:57:59 +0000 Subject: Remove incorrect aria-multiselectable Closes https://github.com/twbs/bootstrap/issues/21635 --- docs/components/collapse.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/components/collapse.md') diff --git a/docs/components/collapse.md b/docs/components/collapse.md index f48efd9cc..18d1c1298 100644 --- a/docs/components/collapse.md +++ b/docs/components/collapse.md @@ -43,7 +43,7 @@ You can use a link with the `href` attribute, or a button with the `data-target` Extend the default collapse behavior to create an accordion. {% example html %} -
+