diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-07-09 11:44:43 +0300 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-07-09 11:44:43 +0300 |
| commit | 775910d3726007c94c74e49f3f243464e50d65f0 (patch) | |
| tree | 9d1d8d361986f584a0ba813f6b6b34996dcafd68 | |
| parent | 5e8d6c4281dd84b723f5283aaaf651db26b92a14 (diff) | |
| parent | 563bfca700214066fbdfd8286c75f45f3f9439f6 (diff) | |
Merge branch 'mf-modal-style-content-size' into 'master'
Adjust modal body styles to match design spec
See merge request gitlab-org/gitlab-ce!30425
| -rw-r--r-- | app/assets/stylesheets/framework/modal.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index f8b3a1966d7..975dca168d5 100644 --- a/app/assets/stylesheets/framework/modal.scss +++ b/app/assets/stylesheets/framework/modal.scss @@ -35,7 +35,8 @@ background-color: $modal-body-bg; line-height: $line-height-base; position: relative; - padding: #{3 * $grid-size} #{2 * $grid-size}; + min-height: $modal-body-height; + padding: #{2 * $grid-size} #{6 * $grid-size} #{2 * $grid-size} #{2 * $grid-size}; text-align: left; white-space: normal; diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index b6a24247d40..406bcda418e 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -805,7 +805,7 @@ $border-color-settings: #e1e1e1; /* Modals */ -$modal-body-height: 134px; +$modal-body-height: 80px; $modal-border-color: #e9ecef; $priority-label-empty-state-width: 114px; |