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
54d76805
Commit
54d76805
authored
7 years ago
by
Mark Otto
Committed by
GitHub
7 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Redo .card-deck and .card-group so they're always flex (#22860)
parent
2be34d5c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scss/_card.scss
+21
-6
scss/_card.scss
scss/_variables.scss
+2
-1
scss/_variables.scss
with
23 additions
and
7 deletions
+23
-7
scss/_card.scss
+
21
-
6
View file @
54d76805
...
...
@@ -130,9 +130,15 @@
// Card deck
@include
media-breakpoint-up
(
sm
)
{
.card-deck
{
display
:
flex
;
.card-deck
{
display
:
flex
;
flex-direction
:
column
;
.card
{
margin-bottom
:
$card-deck-margin
;
}
@include
media-breakpoint-up
(
sm
)
{
flex-flow
:
row
wrap
;
margin-right
:
-
$card-deck-margin
;
margin-left
:
-
$card-deck-margin
;
...
...
@@ -142,6 +148,7 @@
flex
:
1
0
0%
;
flex-direction
:
column
;
margin-right
:
$card-deck-margin
;
margin-bottom
:
0
;
// Override the default
margin-left
:
$card-deck-margin
;
}
}
...
...
@@ -152,15 +159,22 @@
// Card groups
//
@include
media-breakpoint-up
(
sm
)
{
.card-group
{
display
:
flex
;
.card-group
{
display
:
flex
;
flex-direction
:
column
;
.card
{
margin-bottom
:
$card-group-margin
;
}
@include
media-breakpoint-up
(
sm
)
{
flex-flow
:
row
wrap
;
.card
{
flex
:
1
0
0%
;
+
.card
{
margin-bottom
:
0
;
margin-left
:
0
;
border-left
:
0
;
}
...
...
@@ -177,6 +191,7 @@
border-bottom-right-radius
:
0
;
}
}
&
:last-child
{
@include
border-left-radius
(
0
);
...
...
This diff is collapsed.
Click to expand it.
scss/_variables.scss
+
2
-
1
View file @
54d76805
...
...
@@ -632,7 +632,8 @@ $card-bg: $white !default;
$card-img-overlay-padding
:
1
.25rem
!
default
;
$card-deck-margin
:
(
$grid-gutter-width
/
2
)
!
default
;
$card-group-margin
:
(
$grid-gutter-width
/
2
)
!
default
;
$card-deck-margin
:
$card-group-margin
!
default
;
$card-columns-count
:
3
!
default
;
$card-columns-gap
:
1
.25rem
!
default
;
...
...
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