From 8fb8256dae927921a06d2382b953c0c042eb7031 Mon Sep 17 00:00:00 2001 From: Adam Kolinski Date: Fri, 23 Feb 2018 10:57:20 +1100 Subject: [PATCH 1/5] Adding a variable to handle the change of a modals border-radius. --- scss/_modal.scss | 4 ++-- scss/_variables.scss | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scss/_modal.scss b/scss/_modal.scss index edda836636dc..236c79601a8c 100644 --- a/scss/_modal.scss +++ b/scss/_modal.scss @@ -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; @@ -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; diff --git a/scss/_variables.scss b/scss/_variables.scss index 11f325530719..848aadfb7c68 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -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; $modal-lg: 800px !default; $modal-md: 500px !default; From 3d093426afc3b3f7019d84cd1528af59f9b247a8 Mon Sep 17 00:00:00 2001 From: Adam Kolinski Date: Sun, 25 Feb 2018 16:23:41 +1100 Subject: [PATCH 2/5] Move variable up and renamed variable for modal border radius --- scss/_modal.scss | 4 ++-- scss/_variables.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scss/_modal.scss b/scss/_modal.scss index 236c79601a8c..fea8112371de 100644 --- a/scss/_modal.scss +++ b/scss/_modal.scss @@ -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($modal-border-radius); + @include border-radius($modal-content-border-radius); @include box-shadow($modal-content-box-shadow-xs); // Remove focus outline from opened modal outline: 0; @@ -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($modal-border-radius); + @include border-top-radius($modal-content-border-radius); .close { padding: $modal-header-padding; diff --git a/scss/_variables.scss b/scss/_variables.scss index 848aadfb7c68..28869c73333e 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -771,6 +771,7 @@ $modal-content-border-color: rgba($black, .2) !default; $modal-content-border-width: $border-width !default; $modal-content-box-shadow-xs: 0 .25rem .5rem rgba($black, .5) !default; $modal-content-box-shadow-sm-up: 0 .5rem 1rem rgba($black, .5) !default; +$modal-content-border-radius: $border-radius-lg !default; $modal-backdrop-bg: $black !default; $modal-backdrop-opacity: .5 !default; @@ -779,7 +780,6 @@ $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; $modal-lg: 800px !default; $modal-md: 500px !default; From 01d282f5e18a3e5783f1913f467b3decb2b0fe32 Mon Sep 17 00:00:00 2001 From: Adam Kolinski Date: Fri, 23 Feb 2018 10:57:20 +1100 Subject: [PATCH 3/5] Adding a variable to handle the change of a modals border-radius. --- scss/_modal.scss | 4 ++-- scss/_variables.scss | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scss/_modal.scss b/scss/_modal.scss index edda836636dc..236c79601a8c 100644 --- a/scss/_modal.scss +++ b/scss/_modal.scss @@ -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; @@ -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; diff --git a/scss/_variables.scss b/scss/_variables.scss index 11f325530719..848aadfb7c68 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -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; $modal-lg: 800px !default; $modal-md: 500px !default; From bdd6b73d1af1d3cca8ff1dd945cf3ba287e888ea Mon Sep 17 00:00:00 2001 From: Adam Kolinski Date: Sun, 25 Feb 2018 16:23:41 +1100 Subject: [PATCH 4/5] Move variable up and renamed variable for modal border radius --- scss/_modal.scss | 4 ++-- scss/_variables.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scss/_modal.scss b/scss/_modal.scss index 236c79601a8c..fea8112371de 100644 --- a/scss/_modal.scss +++ b/scss/_modal.scss @@ -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($modal-border-radius); + @include border-radius($modal-content-border-radius); @include box-shadow($modal-content-box-shadow-xs); // Remove focus outline from opened modal outline: 0; @@ -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($modal-border-radius); + @include border-top-radius($modal-content-border-radius); .close { padding: $modal-header-padding; diff --git a/scss/_variables.scss b/scss/_variables.scss index 848aadfb7c68..28869c73333e 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -771,6 +771,7 @@ $modal-content-border-color: rgba($black, .2) !default; $modal-content-border-width: $border-width !default; $modal-content-box-shadow-xs: 0 .25rem .5rem rgba($black, .5) !default; $modal-content-box-shadow-sm-up: 0 .5rem 1rem rgba($black, .5) !default; +$modal-content-border-radius: $border-radius-lg !default; $modal-backdrop-bg: $black !default; $modal-backdrop-opacity: .5 !default; @@ -779,7 +780,6 @@ $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; $modal-lg: 800px !default; $modal-md: 500px !default; From 9c4d8d8042a99905bc3d343c9dc792e7bcc7099a Mon Sep 17 00:00:00 2001 From: Andres Galante Date: Mon, 26 Feb 2018 08:54:08 -0300 Subject: [PATCH 5/5] moves variable to be together with the other border related variables --- scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 28869c73333e..b43a8d41c64a 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -769,9 +769,9 @@ $modal-title-line-height: $line-height-base !default; $modal-content-bg: $white !default; $modal-content-border-color: rgba($black, .2) !default; $modal-content-border-width: $border-width !default; +$modal-content-border-radius: $border-radius-lg !default; $modal-content-box-shadow-xs: 0 .25rem .5rem rgba($black, .5) !default; $modal-content-box-shadow-sm-up: 0 .5rem 1rem rgba($black, .5) !default; -$modal-content-border-radius: $border-radius-lg !default; $modal-backdrop-bg: $black !default; $modal-backdrop-opacity: .5 !default;