summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormfluharty <mfluharty@gitlab.com>2019-07-05 13:20:49 -0600
committermfluharty <mfluharty@gitlab.com>2019-07-05 16:03:22 -0600
commit563bfca700214066fbdfd8286c75f45f3f9439f6 (patch)
treeb5115d6647688b24c21f47a56f5b1a3ceead16ea
parent01fea14f51329708f21b98d9b1e0d17fdded0fbf (diff)
downloadgitlab-ce-mf-modal-style-content-size.tar.gz
Adjust modal body styles to match design specmf-modal-style-content-size
Set min-height to 80px via $modal-body-height Set padding to 16px overall and 48px on right via $grid-size
-rw-r--r--app/assets/stylesheets/framework/modal.scss3
-rw-r--r--app/assets/stylesheets/framework/variables.scss2
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss
index f75e5b55506..c08e1898cd8 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;