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.

Sign up for GitHub

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

Jump to bottom

Use child combinators to avoid inheriting parent accordion's flush styles #37508

Merged
merged 10 commits into from
Nov 17, 2023
Merged

Use child combinators to avoid inheriting parent accordion's flush styles #37508

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
19f335b
Use child combinators to avoid inheriting parent accordion's flush st…
nkdas91 Nov 17, 2022
a835183
Merge branch 'main' into accordion
nkdas91 Nov 24, 2022
ea3a9bd
Merge branch 'main' into accordion
nkdas91 Nov 26, 2022
47ee5d7
Merge branch 'main' into accordion
nkdas91 Dec 26, 2022
36bf19b
Merge branch 'main' into accordion
patrickhlauke Dec 28, 2022
a1cc287
Merge branch 'main' into accordion
patrickhlauke Dec 30, 2022
9387fbf
Merge branch 'main' into accordion
nkdas91 Feb 21, 2023
fbd3399
Merge branch 'main' into accordion
nkdas91 Mar 13, 2023
3257584
Merge branch 'main' into accordion
nkdas91 Jul 24, 2023
5bcdd55
Merge branch 'main' into accordion
julien-deramond Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 11 additions & 9 deletions scss/_accordion.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
&:first-of-type {
@include border-top-radius(var(--#{$prefix}accordion-border-radius));

.accordion-button {
> .accordion-header .accordion-button {
@include border-top-radius(var(--#{$prefix}accordion-inner-border-radius));
}
}
Expand All @@ -105,13 +105,13 @@
&:last-of-type {
@include border-bottom-radius(var(--#{$prefix}accordion-border-radius));

.accordion-button {
> .accordion-header .accordion-button {
&.collapsed {
@include border-bottom-radius(var(--#{$prefix}accordion-inner-border-radius));
}
}

.accordion-collapse {
> .accordion-collapse {
@include border-bottom-radius(var(--#{$prefix}accordion-border-radius));
}
}
Expand All @@ -127,24 +127,26 @@
// Remove borders and border-radius to keep accordion items edge-to-edge.

.accordion-flush {
.accordion-collapse {
border-width: 0;
}

.accordion-item {
> .accordion-item {
border-right: 0;
border-left: 0;
@include border-radius(0);

&:first-child { border-top: 0; }
&:last-child { border-bottom: 0; }

.accordion-button {
// stylelint-disable selector-max-class
> .accordion-header .accordion-button {
&,
&.collapsed {
@include border-radius(0);
}
}
// stylelint-enable selector-max-class

> .accordion-collapse {
@include border-radius(0);
}
}
}

Expand Down