summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-08-09 13:56:38 +0000
committerPhil Hughes <me@iamphill.com>2017-08-09 13:56:38 +0000
commitd60f5ee4155ac835ee477f5f58190c5f9fe5f43a (patch)
tree56ed2f902c255e415eed1eb5ecff5df02fdf5de3
parent705dbe6162017b20020c202194fabaeb475e4187 (diff)
parent2bb7f357a9c445984abcb79ec809269e77d939cc (diff)
downloadgitlab-ce-d60f5ee4155ac835ee477f5f58190c5f9fe5f43a.tar.gz
Merge branch 'fix-collapsed-sidebar-item-height' into 'master'
Fix height of collapsed sidebar items See merge request !13385
-rw-r--r--app/assets/stylesheets/new_sidebar.scss7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss
index 3fc8939f658..20754301584 100644
--- a/app/assets/stylesheets/new_sidebar.scss
+++ b/app/assets/stylesheets/new_sidebar.scss
@@ -104,11 +104,14 @@ $new-sidebar-collapsed-width: 50px;
&.sidebar-icons-only {
width: $new-sidebar-collapsed-width;
- .nav-item-name,
.badge,
.project-title {
display: none;
}
+
+ .nav-item-name {
+ opacity: 0;
+ }
}
&.nav-sidebar-expanded {
@@ -361,7 +364,7 @@ $new-sidebar-collapsed-width: 50px;
.sidebar-icons-only {
.context-header {
- height: 60px;
+ height: 61px;
a {
padding: 10px 4px;