From ad62301a5beb3cc4917f57a9b0ac4624995b502b Mon Sep 17 00:00:00 2001
From: Sergey Kovalenko <kvlsrg@gmail.com>
Date: Tue, 25 Jun 2019 09:23:36 +0300
Subject: [PATCH] Remove negative margins for group list items (#28940)
To fix RGBA borders overlapping issue.
---
scss/_list-group.scss | 47 ++++++++++++++++++++++++++-----------------
1 file changed, 28 insertions(+), 19 deletions(-)
diff --git a/scss/_list-group.scss b/scss/_list-group.scss
index 71edfb2d34..d857bf8fdc 100644
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@ -46,8 +46,6 @@
position: relative;
display: block;
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;
background-color: $list-group-bg;
border: $list-group-border-width solid $list-group-border-color;
@@ -57,7 +55,6 @@
}
&:last-child {
- margin-bottom: 0;
@include border-bottom-radius($list-group-border-radius);
}
@@ -75,6 +72,15 @@
background-color: $list-group-active-bg;
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;
+ }
+ }
}
@@ -90,19 +96,29 @@
flex-direction: row;
.list-group-item {
- margin-right: -$list-group-border-width;
- margin-bottom: 0;
-
&:first-child {
@include border-left-radius($list-group-border-radius);
@include border-top-right-radius(0);
}
&:last-child {
- margin-right: 0;
@include border-right-radius($list-group-border-radius);
@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;
+ }
+ }
}
}
}
@@ -116,25 +132,18 @@
.list-group-flush {
.list-group-item {
- border-right: 0;
- border-left: 0;
+ border-right-width: 0;
+ border-left-width: 0;
@include border-radius(0);
- &:last-child {
- margin-bottom: -$list-group-border-width;
- }
- }
-
- &:first-child {
- .list-group-item:first-child {
- border-top: 0;
+ &:first-child {
+ border-top-width: 0;
}
}
&:last-child {
.list-group-item:last-child {
- margin-bottom: 0;
- border-bottom: 0;
+ border-bottom-width: 0;
}
}
}
--
GitLab