Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-05-02 19:03:57 +0300
committerClement Ho <clemmakesapps@gmail.com>2018-05-02 19:03:57 +0300
commite662cab54384a795c109073cee1ba177b34747e1 (patch)
treeead18dc4c865dc5c47ced010542d5d877ce219b9
parent59f79383a7f8dadd9c356f3872133e7675dd61c5 (diff)
parentdbb2f4e88135cf9e3286b75c215b0ba2221eb8a8 (diff)
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
-rw-r--r--app/assets/stylesheets/framework/blocks.scss4
-rw-r--r--app/assets/stylesheets/framework/variables.scss1
-rw-r--r--changelogs/unreleased/increase-new-issue-metadata-form-margin.yml5
3 files changed, 8 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;
diff --git a/changelogs/unreleased/increase-new-issue-metadata-form-margin.yml b/changelogs/unreleased/increase-new-issue-metadata-form-margin.yml
new file mode 100644
index 00000000000..a7196f67969
--- /dev/null
+++ b/changelogs/unreleased/increase-new-issue-metadata-form-margin.yml
@@ -0,0 +1,5 @@
+---
+title: Increase new issue metadata form margin
+merge_request: 18630
+author: George Tsiolis
+type: fixed