diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-03-01 10:54:17 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-01 10:54:17 +0000 |
| commit | 5b22ee50e3ae1794c9a53045c937dd49f5fec18b (patch) | |
| tree | 04afa5fd9f70ea12fab1e016fed269af6c46870d | |
| parent | dc6099a5fa14b82f78514bb329962f397d1acd26 (diff) | |
| parent | befbb3004a6bbe35ab940a9a7f599192b0aabb71 (diff) | |
| download | gitlab-ce-5b22ee50e3ae1794c9a53045c937dd49f5fec18b.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.scss | 15 |
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; |