summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKushal Pandya <kushalspandya@gmail.com>2018-12-14 05:25:13 +0000
committerKushal Pandya <kushalspandya@gmail.com>2018-12-14 05:25:13 +0000
commit1bfb71a888037ab4eb9323c9a42f46a24f910739 (patch)
tree0968fa7b0522c3b60d06ce183e1710108a5e093f
parent0087396036b265879771380e60787e2072318fd1 (diff)
parent9f16b2497a42c54e4c479e6c076a1dc0159432c4 (diff)
downloadgitlab-ce-1bfb71a888037ab4eb9323c9a42f46a24f910739.tar.gz
Merge branch 'winh-dropdown-title-padding' into 'master'
Adjust padding of .dropdown-title to comply with design specs See merge request gitlab-org/gitlab-ce!23546
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss5
-rw-r--r--changelogs/unreleased/winh-dropdown-title-padding.yml5
2 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index b47b1cb76dc..afcb230797a 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -534,8 +534,9 @@
.dropdown-title {
position: relative;
- padding: 2px 25px 10px;
- margin: 0 10px 10px;
+ padding: $dropdown-item-padding-y $dropdown-item-padding-x;
+ padding-bottom: #{2 * $dropdown-item-padding-y};
+ margin-bottom: $dropdown-item-padding-y;
font-weight: $gl-font-weight-bold;
line-height: 1;
text-align: center;
diff --git a/changelogs/unreleased/winh-dropdown-title-padding.yml b/changelogs/unreleased/winh-dropdown-title-padding.yml
new file mode 100644
index 00000000000..9d65175b536
--- /dev/null
+++ b/changelogs/unreleased/winh-dropdown-title-padding.yml
@@ -0,0 +1,5 @@
+---
+title: Adjust padding of .dropdown-title to comply with design specs
+merge_request: 23546
+author:
+type: changed