root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity

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

Co-authored-by: Patrick H. Lauke <redux@splintered.co.uk>
Co-authored-by: Julien Déramond <juderamond@gmail.com>
This commit is contained in:
Neeraj Kumar Das 2023-11-17 17:29:35 +05:30 committed by GitHub
parent 55952bfe64
commit ee88ae6496
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scss/_accordion.scss
View File

@ -92,7 +92,7 @@
&:first-of-type { &:first-of-type {
@include border-top-radius(var(--#{$prefix}accordion-border-radius)); @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)); @include border-top-radius(var(--#{$prefix}accordion-inner-border-radius));
} }
} }
@ -105,13 +105,13 @@
&:last-of-type { &:last-of-type {
@include border-bottom-radius(var(--#{$prefix}accordion-border-radius)); @include border-bottom-radius(var(--#{$prefix}accordion-border-radius));
.accordion-button { > .accordion-header .accordion-button {
&.collapsed { &.collapsed {
@include border-bottom-radius(var(--#{$prefix}accordion-inner-border-radius)); @include border-bottom-radius(var(--#{$prefix}accordion-inner-border-radius));
} }
} }
.accordion-collapse { > .accordion-collapse {
@include border-bottom-radius(var(--#{$prefix}accordion-border-radius)); @include border-bottom-radius(var(--#{$prefix}accordion-border-radius));
} }
} }
@ -127,11 +127,7 @@
// Remove borders and border-radius to keep accordion items edge-to-edge. // Remove borders and border-radius to keep accordion items edge-to-edge.
.accordion-flush { .accordion-flush {
.accordion-collapse { > .accordion-item {
border-width: 0;
}
.accordion-item {
border-right: 0; border-right: 0;
border-left: 0; border-left: 0;
@include border-radius(0); @include border-radius(0);
@ -139,12 +135,18 @@
&:first-child { border-top: 0; } &:first-child { border-top: 0; }
&:last-child { border-bottom: 0; } &:last-child { border-bottom: 0; }
.accordion-button { // stylelint-disable selector-max-class
> .accordion-header .accordion-button {
&, &,
&.collapsed { &.collapsed {
@include border-radius(0); @include border-radius(0);
} }
} }
// stylelint-enable selector-max-class
> .accordion-collapse {
@include border-radius(0);
}
} }
} }