summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKushal Pandya <kushalspandya@gmail.com>2018-12-05 09:50:10 +0000
committerKushal Pandya <kushalspandya@gmail.com>2018-12-05 09:50:10 +0000
commit14db2a42149cc1680762cf6df443677d76dca9ee (patch)
treef0488210911b55b5f9d66de8d70fe12e8507e062
parent650f3e3ab3781e52865351516c4e690245c145b2 (diff)
parent7043fbaeecf158dbdc3334a8b631845854bc77cc (diff)
downloadgitlab-ce-14db2a42149cc1680762cf6df443677d76dca9ee.tar.gz
Merge branch 'winh-divider-margin' into 'master'
Adjust divider margin to comply with design specs See merge request gitlab-org/gitlab-ce!23548
-rw-r--r--app/assets/stylesheets/framework/variables_overrides.scss1
-rw-r--r--changelogs/unreleased/winh-divider-margin.yml5
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/variables_overrides.scss b/app/assets/stylesheets/framework/variables_overrides.scss
index 759b4f333ca..711de02cd39 100644
--- a/app/assets/stylesheets/framework/variables_overrides.scss
+++ b/app/assets/stylesheets/framework/variables_overrides.scss
@@ -19,3 +19,4 @@ $info: $blue-500;
$warning: $orange-500;
$danger: $red-500;
$zindex-modal-backdrop: 1040;
+$nav-divider-margin-y: ($grid-size / 2);
diff --git a/changelogs/unreleased/winh-divider-margin.yml b/changelogs/unreleased/winh-divider-margin.yml
new file mode 100644
index 00000000000..db84090c15c
--- /dev/null
+++ b/changelogs/unreleased/winh-divider-margin.yml
@@ -0,0 +1,5 @@
+---
+title: Adjust divider margin to comply with design specs
+merge_request: 23548
+author:
+type: changed