summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-07-20 18:20:33 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-07-20 18:20:33 +0000
commit01e029887f23019c7a0d3561ae6660ebcda6f044 (patch)
tree57c7b40d9d4037b01c1849488b1c44af265fa894
parent7428fe62b1fa4cd6ed3808c047d4bc1c7c1e22e1 (diff)
parent0ef66623bfa2b1d3f673b731255bf523527dcf8d (diff)
downloadgitlab-ce-01e029887f23019c7a0d3561ae6660ebcda6f044.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 ce8f4c41cb5..abc985639b6 100644
--- a/app/assets/stylesheets/new_sidebar.scss
+++ b/app/assets/stylesheets/new_sidebar.scss
@@ -165,7 +165,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: