summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-03-01 10:54:17 +0000
committerRémy Coutable <remy@rymai.me>2016-03-01 11:57:27 +0100
commit5c8f6ba3ddc71f98e91b5679797e565e66f29b1b (patch)
tree0a436d3a26bcbdfea64dbc9c25e63b8cb62d93ea
parent710b3356ff6597dc9d6374504650fd7086660010 (diff)
downloadgitlab-ce-5c8f6ba3ddc71f98e91b5679797e565e66f29b1b.tar.gz
Merge branch 'issue_13851' into 'master'
Brings back missing "Gitlab" text on the logo Closes #13851 See merge request !2989
-rw-r--r--app/assets/stylesheets/framework/sidebar.scss15
1 files changed, 14 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index e0ccd6f100f..0596924a8f6 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -13,6 +13,19 @@
transition-duration: .3s;
}
+ .home {
+ z-index: 1;
+ position: absolute;
+ left: 0px;
+ }
+
+ #logo {
+ z-index: 2;
+ position: absolute;
+ width: 58px;
+ cursor: pointer;
+ }
+
&.right-sidebar-expanded {
padding-right: $gutter_width;
}
@@ -74,7 +87,7 @@
width: 158px;
float: left;
margin: 0;
- margin-left: 14px;
+ margin-left: 50px;
font-size: 19px;
line-height: 41px;
font-weight: normal;