From 74c31b2a4aaf9dedfc01e45fb03a7cd36a53dcf1 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Wed, 28 Jun 2017 09:52:11 -0500
Subject: Make header into links; CSS tweaks

---
 app/assets/stylesheets/new_sidebar.scss              | 10 ++++++++--
 app/views/layouts/nav/_new_admin_sidebar.html.haml   |  3 +--
 app/views/layouts/nav/_new_group_sidebar.html.haml   |  2 +-
 app/views/layouts/nav/_new_profile_sidebar.html.haml |  6 +++---
 app/views/layouts/nav/_new_project_sidebar.html.haml |  2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss
index c8f0e1f4764..efcf456a8d1 100644
--- a/app/assets/stylesheets/new_sidebar.scss
+++ b/app/assets/stylesheets/new_sidebar.scss
@@ -19,6 +19,7 @@ $new-sidebar-width: 220px;
 .context-header {
   background-color: $gray-normal;
   border-bottom: 1px solid $border-color;
+  font-weight: 600;
   display: flex;
   align-items: center;
   padding: 10px 14px;
@@ -26,15 +27,20 @@ $new-sidebar-width: 220px;
   .avatar-container {
     flex: 0 0 40px;
   }
+
+  &:hover {
+    background-color: $border-color;
+  }
 }
 
 .settings-avatar {
   background-color: $white-light;
 
-  .fa-wrench {
+  .fa-wrench,
+  .fa-user {
     font-size: 20px;
     width: 100%;
-    color: $gl-text-color-light;
+    color: $gl-text-color-secondary;
     text-align: center;
     align-self: center;
   }
diff --git a/app/views/layouts/nav/_new_admin_sidebar.html.haml b/app/views/layouts/nav/_new_admin_sidebar.html.haml
index a5cb3e0da73..c9415469912 100644
--- a/app/views/layouts/nav/_new_admin_sidebar.html.haml
+++ b/app/views/layouts/nav/_new_admin_sidebar.html.haml
@@ -1,6 +1,5 @@
 .nav-sidebar
-  -# = render 'layouts/nav/admin_settings'
-  .context-header
+  = link_to admin_root_path, title: 'Overview', class: 'context-header' do
     .avatar-container.s40.settings-avatar
       = icon('wrench')
     .project-title Admin Area
diff --git a/app/views/layouts/nav/_new_group_sidebar.html.haml b/app/views/layouts/nav/_new_group_sidebar.html.haml
index 8eab32a6391..7720918be54 100644
--- a/app/views/layouts/nav/_new_group_sidebar.html.haml
+++ b/app/views/layouts/nav/_new_group_sidebar.html.haml
@@ -1,5 +1,5 @@
 .nav-sidebar
-  .context-header
+  = link_to group_path(@group), title: 'Home', class: 'context-header' do
     .avatar-container.s40.group-avatar
       = image_tag group_icon(@group), class: "avatar s40 avatar-tile"
     .group-title
diff --git a/app/views/layouts/nav/_new_profile_sidebar.html.haml b/app/views/layouts/nav/_new_profile_sidebar.html.haml
index 465bad1de21..033ea149cfb 100644
--- a/app/views/layouts/nav/_new_profile_sidebar.html.haml
+++ b/app/views/layouts/nav/_new_profile_sidebar.html.haml
@@ -1,8 +1,8 @@
 .nav-sidebar
-  .context-header
+  = link_to profile_path, title: 'Profile Settings', class: 'context-header' do
     .avatar-container.s40.settings-avatar
-      = icon('wrench')
-    .project-title Settings
+      = icon('user')
+    .project-title User Settings
   %ul.sidebar-top-level-items
     = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
       = link_to profile_path, title: 'Profile Settings' do
diff --git a/app/views/layouts/nav/_new_project_sidebar.html.haml b/app/views/layouts/nav/_new_project_sidebar.html.haml
index de0f4e3d2bc..eae9da5da14 100644
--- a/app/views/layouts/nav/_new_project_sidebar.html.haml
+++ b/app/views/layouts/nav/_new_project_sidebar.html.haml
@@ -1,6 +1,6 @@
 .nav-sidebar
   - can_edit = can?(current_user, :admin_project, @project)
-  .context-header
+  = link_to project_path(@project), title: 'Project', class: 'context-header' do
     .avatar-container.s40.project-avatar
       = project_icon(@project, alt: @project.name, class: 'avatar s40 avatar-tile')
     .project-title
-- 
cgit v1.2.1