mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-20 17:54:23 +01:00
Remove negative margins for group list items (#28940)
To fix RGBA borders overlapping issue.
This commit is contained in:
parent
a92f838c8d
commit
22f6b373f9
@ -45,8 +45,6 @@
|
|||||||
position: relative;
|
position: relative;
|
||||||
display: block;
|
display: block;
|
||||||
padding: $list-group-item-padding-y $list-group-item-padding-x;
|
padding: $list-group-item-padding-y $list-group-item-padding-x;
|
||||||
// Place the border on the list items and negative margin up for better styling
|
|
||||||
margin-bottom: -$list-group-border-width;
|
|
||||||
color: $list-group-color;
|
color: $list-group-color;
|
||||||
background-color: $list-group-bg;
|
background-color: $list-group-bg;
|
||||||
border: $list-group-border-width solid $list-group-border-color;
|
border: $list-group-border-width solid $list-group-border-color;
|
||||||
@ -56,7 +54,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
&:last-child {
|
&:last-child {
|
||||||
margin-bottom: 0;
|
|
||||||
@include border-bottom-radius($list-group-border-radius);
|
@include border-bottom-radius($list-group-border-radius);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -74,6 +71,15 @@
|
|||||||
background-color: $list-group-active-bg;
|
background-color: $list-group-active-bg;
|
||||||
border-color: $list-group-active-border-color;
|
border-color: $list-group-active-border-color;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
& + & {
|
||||||
|
border-top-width: 0;
|
||||||
|
|
||||||
|
&.active {
|
||||||
|
margin-top: -$list-group-border-width;
|
||||||
|
border-top-width: $list-group-border-width;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -89,19 +95,29 @@
|
|||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
|
|
||||||
.list-group-item {
|
.list-group-item {
|
||||||
margin-right: -$list-group-border-width;
|
|
||||||
margin-bottom: 0;
|
|
||||||
|
|
||||||
&:first-child {
|
&:first-child {
|
||||||
@include border-left-radius($list-group-border-radius);
|
@include border-left-radius($list-group-border-radius);
|
||||||
@include border-top-right-radius(0);
|
@include border-top-right-radius(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
&:last-child {
|
&:last-child {
|
||||||
margin-right: 0;
|
|
||||||
@include border-right-radius($list-group-border-radius);
|
@include border-right-radius($list-group-border-radius);
|
||||||
@include border-bottom-left-radius(0);
|
@include border-bottom-left-radius(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.active {
|
||||||
|
margin-top: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
& + .list-group-item {
|
||||||
|
border-top-width: $list-group-border-width;
|
||||||
|
border-left-width: 0;
|
||||||
|
|
||||||
|
&.active {
|
||||||
|
margin-left: -$list-group-border-width;
|
||||||
|
border-left-width: $list-group-border-width;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -115,25 +131,18 @@
|
|||||||
|
|
||||||
.list-group-flush {
|
.list-group-flush {
|
||||||
.list-group-item {
|
.list-group-item {
|
||||||
border-right: 0;
|
border-right-width: 0;
|
||||||
border-left: 0;
|
border-left-width: 0;
|
||||||
@include border-radius(0);
|
@include border-radius(0);
|
||||||
|
|
||||||
&:last-child {
|
&:first-child {
|
||||||
margin-bottom: -$list-group-border-width;
|
border-top-width: 0;
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
&:first-child {
|
|
||||||
.list-group-item:first-child {
|
|
||||||
border-top: 0;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&:last-child {
|
&:last-child {
|
||||||
.list-group-item:last-child {
|
.list-group-item:last-child {
|
||||||
margin-bottom: 0;
|
border-bottom-width: 0;
|
||||||
border-bottom: 0;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user