From b3125aa4995fb52d50757a6a6dfd3f6025bd60a0 Mon Sep 17 00:00:00 2001 From: Kevin Kirsche Date: Thu, 20 Aug 2015 15:34:13 -0400 Subject: v4 - Accordion example should use cards Partial Fix: #17157 Additional code needed to get cards to butt up against each other as expected. --- docs/components/collapse.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'docs/components/collapse.md') diff --git a/docs/components/collapse.md b/docs/components/collapse.md index 440d37436..e50851254 100644 --- a/docs/components/collapse.md +++ b/docs/components/collapse.md @@ -43,39 +43,39 @@ Extend the default collapse behavior to create an accordion. {% example html %}
-
-
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. -- cgit v1.2.3 From 0be876359ed4ed7c8a3d315a6ef9a04eede8d765 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 8 Sep 2016 22:16:28 -0700 Subject: Update docs to use new spacing util class names --- docs/components/collapse.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/components/collapse.md') diff --git a/docs/components/collapse.md b/docs/components/collapse.md index ebbefeca4..0e6fa729e 100644 --- a/docs/components/collapse.md +++ b/docs/components/collapse.md @@ -45,7 +45,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. +
+
+ 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. +
@@ -64,8 +66,10 @@ 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. +
+
+ 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. +
@@ -76,8 +80,10 @@ 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. +
+
+ 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. +
-- cgit v1.2.3 From de1255b14e9d1bbfc1a3b055477f4fc15cc974af Mon Sep 17 00:00:00 2001 From: Johann-S Date: Tue, 1 Dec 2015 23:17:35 +0100 Subject: Collapse using card component --- docs/components/collapse.md | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/components/collapse.md') diff --git a/docs/components/collapse.md b/docs/components/collapse.md index d5f620917..e98fae276 100644 --- a/docs/components/collapse.md +++ b/docs/components/collapse.md @@ -52,6 +52,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. -- cgit v1.2.3 From 9d129a43d6c24d9e60cc8fc7cfbddaaa4c586fdf Mon Sep 17 00:00:00 2001 From: Johann-S Date: Mon, 24 Oct 2016 10:57:32 +0200 Subject: Use a single class name for opened/expanded/shown state of widgets --- 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 e98fae276..0ece9e453 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.in` shows content +- `.collapse.active` 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.in` shows the content +- `.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`. ### 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 `in`. +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`. 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 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