diff options
| author | Martijn Cuppens <[email protected]> | 2020-04-02 07:10:11 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-04-02 08:10:11 +0300 |
| commit | e8e6d64eb083b3086e8ea45ec70e02915a514b68 (patch) | |
| tree | 641652e56a0ac28f314d83c227e446f0394cef05 /scss | |
| parent | 1cc1a476468d8106ef2954f959dc7b747159a353 (diff) | |
| download | bootstrap-e8e6d64eb083b3086e8ea45ec70e02915a514b68.tar.xz bootstrap-e8e6d64eb083b3086e8ea45ec70e02915a514b68.zip | |
Fix card list group borders & radii (#30497)
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_card.scss | 17 | ||||
| -rw-r--r-- | scss/_list-group.scss | 19 |
2 files changed, 17 insertions, 19 deletions
diff --git a/scss/_card.scss b/scss/_card.scss index 3099109b1..666092779 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -19,15 +19,18 @@ margin-left: 0; } - > .list-group:first-child { - .list-group-item:first-child { - @include border-top-radius($card-border-radius); + > .list-group { + border-top: inherit; + border-bottom: inherit; + + &:first-child { + border-top-width: 0; + @include border-top-radius($card-inner-border-radius); } - } - > .list-group:last-child { - .list-group-item:last-child { - @include border-bottom-radius($card-border-radius); + &:last-child { + border-bottom-width: 0; + @include border-bottom-radius($card-inner-border-radius); } } } diff --git a/scss/_list-group.scss b/scss/_list-group.scss index fe97ce526..8513cdd9d 100644 --- a/scss/_list-group.scss +++ b/scss/_list-group.scss @@ -9,6 +9,7 @@ // No need to set list-style: none; since .list-group-item is block level padding-left: 0; // reset padding because ul and ol margin-bottom: 0; + @include border-radius($list-group-border-radius); } @@ -52,11 +53,11 @@ border: $list-group-border-width solid $list-group-border-color; &:first-child { - @include border-top-radius($list-group-border-radius); + @include border-top-radius(inherit); } &:last-child { - @include border-bottom-radius($list-group-border-radius); + @include border-bottom-radius(inherit); } &.disabled, @@ -132,18 +133,12 @@ // useful within other components (e.g., cards). .list-group-flush { - .list-group-item { - border-right-width: 0; - border-left-width: 0; - @include border-radius(0); + @include border-radius(0); - &:first-child { - border-top-width: 0; - } - } + .list-group-item { + border-width: 0 0 $list-group-border-width; - &:last-child { - .list-group-item:last-child { + &:last-child { border-bottom-width: 0; } } |