Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
fe9384c2
Commit
fe9384c2
authored
4 years ago
by
Martijn Cuppens
Committed by
XhmikosR
4 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Backport #30497
Fix card list group borders & radii
parent
ddc58343
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scss/_card.scss
+10
-7
scss/_card.scss
scss/_list-group.scss
+7
-12
scss/_list-group.scss
with
17 additions
and
19 deletions
+17
-19
scss/_card.scss
+
10
-
7
View file @
fe9384c2
...
...
@@ -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
);
}
}
}
...
...
This diff is collapsed.
Click to expand it.
scss/_list-group.scss
+
7
-
12
View file @
fe9384c2
...
...
@@ -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
);
}
...
...
@@ -51,11 +52,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
,
...
...
@@ -131,18 +132,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
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment