diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-07-10 14:36:23 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-07-10 14:36:23 +0000 |
| commit | 83094e5e9a11315b1e3ab8d6a733481dcd98d8d9 (patch) | |
| tree | 73e1a6b0d566925df2a2657abe49e6962ca89461 | |
| parent | 473d36d1acc016b6cc494d1568bc31371531c724 (diff) | |
| parent | 0ea42f7d283b213db02f23d3db4a250032b68502 (diff) | |
| download | gitlab-ce-83094e5e9a11315b1e3ab8d6a733481dcd98d8d9.tar.gz | |
Merge branch 'mf-modal-style-border-radius' into 'master'
Adjust modal border radius to match design spec
See merge request gitlab-org/gitlab-ce!30414
| -rw-r--r-- | app/assets/stylesheets/framework/modal.scss | 14 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index 1d00372d04d..b721b90fbb3 100644 --- a/app/assets/stylesheets/framework/modal.scss +++ b/app/assets/stylesheets/framework/modal.scss @@ -90,6 +90,20 @@ body.modal-open { .modal { background-color: $black-transparent; + .modal-content { + 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) { .modal-dialog { margin: 64px auto; diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 4521643ce08..c108f45622f 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -806,6 +806,7 @@ Modals */ $modal-body-height: 80px; $modal-border-color: #e9ecef; +$modal-border-radius: 0.25rem; $priority-label-empty-state-width: 114px; |