Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow nested structure for accordions #25121

Merged
merged 8 commits into from
Dec 31, 2017

Conversation

MartijnCuppens
Copy link
Member

Fixes #25119

Copy link
Member

@Johann-S Johann-S left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a unit test

MartijnCuppens and others added 4 commits December 30, 2017 22:14
This commit allows nested structures for accordions. Also a part of
the documentation about data-children is removed because this
functionality didn't work and it's not applicable anymore.

Tests with the collapse accordion are also a bit adjusted to the new
situation.
@MartijnCuppens
Copy link
Member Author

  • Simplified the documentation (data-children attribute was not used in js and is not needed anymore)
  • Added a unit test for nested elements
  • Fixed existing tests where the data-parent was set on the link and not the collapsible content

@@ -63,7 +63,7 @@ Multiple `<button>` or `<a>` can show and hide an element if they each reference

## Accordion example

Using the [card]({{ site.baseurl }}/docs/{{ site.docs_version }}/components/card/) component, you can extend the default collapse behavior to create an accordion.
You can extend the default collapse behavior to create an accordion.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, this doesn't seem right.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree with @XhmikosR

@mdo mdo mentioned this pull request Dec 31, 2017
@XhmikosR XhmikosR merged commit ae71e71 into twbs:v4-dev Dec 31, 2017
gijsbotje added a commit to gijsbotje/bootstrap that referenced this pull request Dec 31, 2017
* dist

* Outline active focus (twbs#25145)

* Base the outline button :active color on the background, fixing a contrast issue

* Only apply focus outline to active when it's focused

* Add modal-dialog-centered class to vertically centered modal example.

* removes hardcoded value for nav-link padding

* Apply of twbs#25068 to input group

* dist

* docs: Fix overflow issue in IE. (twbs#25142)

* Allow nested structure for accordions (twbs#25121)

This commit allows nested structures for accordions. Also a part of
the documentation about data-children is removed because this
functionality didn't work and it's not applicable anymore.

Tests with the collapse accordion are also a bit adjusted to the new
situation.
@MartijnCuppens MartijnCuppens deleted the collapse-fix-parent branch December 31, 2017 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants