Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding a variable to handle the change of a modals border-radius. #25691

Merged
merged 9 commits into from
Mar 3, 2018
Merged

Adding a variable to handle the change of a modals border-radius. #25691

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8fb8256
Adding a variable to handle the change of a modals border-radius.
akolinski Feb 22, 2018
69b4ebd
Merge branch 'v4-dev' into v4-modal-border-radius-scss-var
akolinski Feb 25, 2018
3d09342
Move variable up and renamed variable for modal border radius
Feb 25, 2018
61a85a1
Merge branch 'v4-modal-border-radius-scss-var' of github.com:akolinsk…
Feb 25, 2018
01d282f
Adding a variable to handle the change of a modals border-radius.
akolinski Feb 22, 2018
bdd6b73
Move variable up and renamed variable for modal border radius
Feb 25, 2018
6c682ac
Merge branch 'v4-modal-border-radius-scss-var' of github.com:akolinsk…
Feb 25, 2018
da0f91c
Merge branch 'v4-dev' into v4-modal-border-radius-scss-var
akolinski Feb 25, 2018
9c4d8d8
moves variable to be together with the other border related variables
andresgalante Feb 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scss/_modal.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
background-color: $modal-content-bg;
background-clip: padding-box;
border: $modal-content-border-width solid $modal-content-border-color;
@include border-radius($border-radius-lg);
@include border-radius($modal-border-radius);
@include box-shadow($modal-content-box-shadow-xs);
// Remove focus outline from opened modal
outline: 0;
Expand Down Expand Up @@ -96,7 +96,7 @@
justify-content: space-between; // Put modal header elements (title and dismiss) on opposite ends
padding: $modal-header-padding;
border-bottom: $modal-header-border-width solid $modal-header-border-color;
@include border-top-radius($border-radius-lg);
@include border-top-radius($modal-border-radius);

.close {
padding: $modal-header-padding;
Expand Down
1 change: 1 addition & 0 deletions scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,6 +779,7 @@ $modal-footer-border-color: $modal-header-border-color !default;
$modal-header-border-width: $modal-content-border-width !default;
$modal-footer-border-width: $modal-header-border-width !default;
$modal-header-padding: 1rem !default;
$modal-border-radius: $border-radius-lg !default;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @akolinski thanks a lot for this PR. I've tested it and it works.

Since this variable is affecting the .modal-content I'd move the variable up to line 776 and name it $modal-content-border-radius.


$modal-lg: 800px !default;
$modal-md: 500px !default;
Expand Down