summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-03-07 18:21:23 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-03-07 18:21:23 +0000
commit0a5eb08ad08ec478160c2cb3a3224f31e9a2c932 (patch)
treef2a410653dbdedacef94715392171c99d9ec3e34
parent3da9cb692911aa4463f92307f66d823f0ea61625 (diff)
parent3004fb3364008a1951ea917ea897869221062212 (diff)
downloadgitlab-ce-0a5eb08ad08ec478160c2cb3a3224f31e9a2c932.tar.gz
Merge branch '39444-make-margin-around-dropdown-dividers-4px' into 'master'
Resolve "Make margin around dropdown dividers 4px" Closes #39444 See merge request gitlab-org/gitlab-ce!17517
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss2
-rw-r--r--changelogs/unreleased/39444-make-margin-around-dropdown-dividers-4px.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 1d7b0b602cc..127583626cf 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -272,7 +272,7 @@
.divider {
height: 1px;
- margin: 6px 0;
+ margin: #{$grid-size / 2} 0;
padding: 0;
background-color: $dropdown-divider-color;
diff --git a/changelogs/unreleased/39444-make-margin-around-dropdown-dividers-4px.yml b/changelogs/unreleased/39444-make-margin-around-dropdown-dividers-4px.yml
new file mode 100644
index 00000000000..da65cfff799
--- /dev/null
+++ b/changelogs/unreleased/39444-make-margin-around-dropdown-dividers-4px.yml
@@ -0,0 +1,5 @@
+---
+title: Set margins around dropdown dividers to 4px
+merge_request: 17517
+author:
+type: fixed