summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-07-20 18:20:33 +0000
committerMike Greiling <mike@pixelcog.com>2017-07-20 17:06:19 -0500
commitfacd999c30bf04b37e2e944c76f71f03bfd8307c (patch)
treec03208d4be9861285335cb4de318530399b2e536
parent496d0de3464b006dc8a458cdbdee22d2def50383 (diff)
downloadgitlab-ce-facd999c30bf04b37e2e944c76f71f03bfd8307c.tar.gz
Merge branch '34973-sub-nav-item-font-size' into 'master'
34973 Make font size of contextual sub menu items 14px Closes #34973 See merge request !12951
-rw-r--r--app/assets/stylesheets/new_sidebar.scss1
-rw-r--r--changelogs/unreleased/34973-sub-nav-item-font-size.yml4
2 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss
index 6be321e5732..ad8a271938a 100644
--- a/app/assets/stylesheets/new_sidebar.scss
+++ b/app/assets/stylesheets/new_sidebar.scss
@@ -127,7 +127,6 @@ $new-sidebar-width: 220px;
> li {
a {
- font-size: 12px;
padding: 8px 16px 8px 24px;
&:hover,
diff --git a/changelogs/unreleased/34973-sub-nav-item-font-size.yml b/changelogs/unreleased/34973-sub-nav-item-font-size.yml
new file mode 100644
index 00000000000..90bf171fe3b
--- /dev/null
+++ b/changelogs/unreleased/34973-sub-nav-item-font-size.yml
@@ -0,0 +1,4 @@
+---
+title: Make font size of contextual sub menu items 14px
+merge_request:
+author: