Move tanuki icon to center of nav bar; keep nav closed by default; remove collapsed nav cookie

3 files changed, 34 insertions, 12 deletions

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index b8d4233537b..f883ad1b8db 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -122,9 +122,18 @@ header {
       margin-top: -5px;
     }
 
+    .header-logo {
+      position: absolute;
+      left: 50%;
+      margin-left: -18px;
+      top: 7px;
+    }
+
     .title {
       margin: 0;
       font-size: 19px;
+      max-width: 250px;
+      display: inline-block;
       line-height: $header-height;
       font-weight: normal;
       color: $gl-text-color;
@@ -190,6 +199,15 @@ header {
   }
 }
 
+.tanuki-shape {
+  transition: all 0.8s;
+
+  &:hover, &.highlight {
+    fill: rgb(255, 255, 255);
+    transition: all 0.1s;
+  }
+}
+
 @media (max-width: $screen-xs-max) {
   header .container-fluid {
     font-size: 18px;
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index a036799e15a..8982eaa6833 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -1,6 +1,7 @@
 @mixin fade($gradient-direction, $rgba, $gradient-color) {
   visibility: visible;
   opacity: 1;
+  z-index: 2;
   position: absolute;
   bottom: 12px;
   width: 43px;
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 06a688690f8..05c87cf0d49 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -66,19 +66,8 @@
   }
 }
 
-
-.tanuki-shape {
-  transition: all 0.8s;
-
-  &:hover, &.highlight {
-    fill: rgb(255, 255, 255);
-    transition: all 0.1s;
-  }
-}
-
-
 .nav-sidebar {
-  margin-top: 22 + $header-height;
+  margin-top: 22px;
   margin-bottom: 116px;
   transition-duration: .3s;
   list-style: none;
@@ -217,6 +206,20 @@
   }
 }
 
+.gitlab-text-container {
+  height: 50px;
+  padding: 5px;
+  text-align: center;
+
+  h3 {
+    color: white;
+    margin: 0;
+    font-size: 19px;
+    line-height: 41px;
+    font-weight: normal;
+  }
+}
+
 .page-sidebar-expanded {
   padding-left: $sidebar_width;