summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormfluharty <mfluharty@gitlab.com>2019-07-09 14:00:40 -0600
committermfluharty <mfluharty@gitlab.com>2019-07-09 14:00:40 -0600
commit0ea42f7d283b213db02f23d3db4a250032b68502 (patch)
tree544c6229ded413aa18e6aa499ca224dbd7b7ee99
parent26f7e8a13a4fe034ae4c2dbdb034c5a72b373835 (diff)
downloadgitlab-ce-mf-modal-style-border-radius.tar.gz
Define modal first and last child border-radiusmf-modal-style-border-radius
Use $modal-border-radius for all modal border radius definitions
-rw-r--r--app/assets/stylesheets/framework/modal.scss12
-rw-r--r--app/assets/stylesheets/framework/variables.scss1
2 files changed, 12 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss
index e72e52a3e62..057abb296bb 100644
--- a/app/assets/stylesheets/framework/modal.scss
+++ b/app/assets/stylesheets/framework/modal.scss
@@ -87,7 +87,17 @@ body.modal-open {
background-color: $black-transparent;
.modal-content {
- border-radius: 0.25rem;
+ border-radius: $modal-border-radius;
+
+ *:first-child {
+ border-top-left-radius: $modal-border-radius;
+ border-top-right-radius: $modal-border-radius;
+ }
+
+ *:last-child {
+ border-bottom-left-radius: $modal-border-radius;
+ border-bottom-right-radius: $modal-border-radius;
+ }
}
@include media-breakpoint-up(sm) {
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 406bcda418e..649fe3c494b 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -807,6 +807,7 @@ Modals
*/
$modal-body-height: 80px;
$modal-border-color: #e9ecef;
+$modal-border-radius: 0.25rem;
$priority-label-empty-state-width: 114px;