summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-05-02 16:03:57 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-05-02 16:03:57 +0000
commite662cab54384a795c109073cee1ba177b34747e1 (patch)
treeead18dc4c865dc5c47ced010542d5d877ce219b9 /app
parent59f79383a7f8dadd9c356f3872133e7675dd61c5 (diff)
parentdbb2f4e88135cf9e3286b75c215b0ba2221eb8a8 (diff)
downloadgitlab-ce-e662cab54384a795c109073cee1ba177b34747e1.tar.gz
Merge branch 'increase-new-issue-metadata-form-margin' into 'master'
Increase new issue metadata form margin Closes #44134 See merge request gitlab-org/gitlab-ce!18630
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/framework/blocks.scss4
-rw-r--r--app/assets/stylesheets/framework/variables.scss1
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index c5c7afe25be..c60f65e7a85 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -46,7 +46,7 @@
}
&.middle-block {
- margin-top: 0;
+ margin-top: $gl-padding-24;
margin-bottom: 0;
}
@@ -61,7 +61,7 @@
}
&.footer-block {
- margin-top: 0;
+ margin-top: $gl-padding-24;
border-bottom: 0;
margin-bottom: -$gl-padding;
}
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 8c44ebc85ef..3d28df455bb 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -212,6 +212,7 @@ $tooltip-font-size: 12px;
/*
* Padding
*/
+$gl-padding-24: 24px;
$gl-padding: 16px;
$gl-padding-8: 8px;
$gl-padding-4: 4px;