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
bbbda681
Commit
bbbda681
authored
5 years ago
by
Martijn Cuppens
Committed by
XhmikosR
5 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Enable wrapping for elements in .modal-footer (#25103)
parent
ceddca71
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scss/_modal.scss
+9
-4
scss/_modal.scss
scss/_variables.scss
+3
-0
scss/_variables.scss
with
12 additions
and
4 deletions
+12
-4
scss/_modal.scss
+
9
-
4
View file @
bbbda681
...
@@ -166,15 +166,20 @@
...
@@ -166,15 +166,20 @@
// Footer (for actions)
// Footer (for actions)
.modal-footer
{
.modal-footer
{
display
:
flex
;
display
:
flex
;
flex-wrap
:
wrap
;
align-items
:
center
;
// vertically center
align-items
:
center
;
// vertically center
justify-content
:
flex-end
;
// Right align buttons with flex property because text-align doesn't work on flex items
justify-content
:
flex-end
;
// Right align buttons with flex property because text-align doesn't work on flex items
padding
:
$modal-inner-padding
;
padding
:
$modal-inner-padding
-
$modal-footer-margin-between
/
2
;
border-top
:
$modal-footer-border-width
solid
$modal-footer-border-color
;
border-top
:
$modal-footer-border-width
solid
$modal-footer-border-color
;
@include
border-bottom-radius
(
$modal-content-inner-border-radius
);
@include
border-bottom-radius
(
$modal-content-inner-border-radius
);
// Easily place margin between footer elements
// Place margin between footer elements
>
:not
(
:first-child
)
{
margin-left
:
.25rem
;
}
// This solution is far from ideal because of the universal selector usage,
>
:not
(
:last-child
)
{
margin-right
:
.25rem
;
}
// but is needed to fix https://github.com/twbs/bootstrap/issues/24800
// stylelint-disable-next-line selector-max-universal
>
*
{
margin
:
$modal-footer-margin-between
/
2
;
}
}
}
// Measure scrollbar width for padding body during modal show/hide
// Measure scrollbar width for padding body during modal show/hide
...
...
This diff is collapsed.
Click to expand it.
scss/_variables.scss
+
3
-
0
View file @
bbbda681
...
@@ -933,6 +933,9 @@ $badge-border-radius: $border-radius !default;
...
@@ -933,6 +933,9 @@ $badge-border-radius: $border-radius !default;
// Padding applied to the modal body
// Padding applied to the modal body
$modal-inner-padding
:
1rem
!
default
;
$modal-inner-padding
:
1rem
!
default
;
// Margin between elements in footer, must be lower than or equal to 2 * $modal-inner-padding
$modal-footer-margin-between
:
.5rem
!
default
;
$modal-dialog-margin
:
.5rem
!
default
;
$modal-dialog-margin
:
.5rem
!
default
;
$modal-dialog-margin-y-sm-up
:
1
.75rem
!
default
;
$modal-dialog-margin-y-sm-up
:
1
.75rem
!
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