Merge branch 'issue_13851' into 'master'

Brings back missing "Gitlab" text on the logo Closes #13851 See merge request !2989

Merge branch 'issue_13851' into 'master'
5b22ee50 · Rémy Coutable · dc6099a5 · befbb300 · 5b22ee50
Commit 5b22ee50 authored Mar 01, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 1 deletion

sidebar.scss app/assets/stylesheets/framework/sidebar.scss +14 -1

No files found.
--- 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;