Add back sidebar counters and username

app/assets/stylesheets/framework/gitlab-theme.scss

@@ -10,8 +10,12 @@
   .page-with-sidebar {
 
     .collapse-nav a {
-      color: $white-light;
+      color: $color-light;
       background: $color;
+
+      &:hover {
+        color: $white-light;
+      }
     }
 
     .sidebar-wrapper {

app/assets/stylesheets/framework/header.scss

@@ -28,6 +28,7 @@ header {
     height: $header-height;
     background-color: $background-color;
     border: none;
+    border-bottom: 1px solid $border-color;
 
     @media (max-width: $screen-xs-min) {
       padding: 0 16px;

app/assets/stylesheets/framework/nav.scss

@@ -172,7 +172,6 @@
     > form {
       display: inline-block;
       margin-top: -1px;
-      margin-bottom: 12px;
     }
 
     .icon-label {

app/assets/stylesheets/framework/sidebar.scss

@@ -115,6 +115,12 @@
       }
     }
   }
+
+  .count {
+    float: right;
+    padding: 0 8px;
+    @include border-radius(6px);
+  }
 }
 
 .sidebar-subnav {
@@ -131,9 +137,10 @@
   position: fixed;
   top: 0;
   left: 0;
-  font-size: 13px;
+  padding: 5px 0;
+  font-size: 18px;
   background: transparent;
-  height: 40px;
+  height: 50px;
   text-align: center;
   line-height: 40px;
   transition-duration: .3s;
@@ -157,7 +164,7 @@
     width: 0;
 
     .nav-sidebar {
-      width: $sidebar_collapsed_width;
+      width: 0;
 
       li {
         width: auto;
@@ -172,6 +179,10 @@
 
     .collapse-nav a {
       width: 0;
+
+      i {
+        display: none;
+      }
     }
 
     .sidebar-user {

app/helpers/nav_helper.rb

@@ -36,13 +36,7 @@ module NavHelper
   end
 
   def nav_header_class
-    class_name =
-      if nav_menu_collapsed?
-        "header-collapsed"
-      else
-        "header-expanded"
-      end
-    class_name += " with-horizontal-nav" if defined?(nav) && nav
+    class_name = " with-horizontal-nav" if defined?(nav) && nav
     class_name
   end
 

app/views/layouts/_page.html.haml

@@ -11,8 +11,10 @@
     .collapse-nav
       = render partial: 'layouts/collapse_button'
     - if current_user
-      = link_to current_user, class: 'sidebar-user', title: "Profile", data: {user: current_user.username} do
-        = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s46'
+      = link_to current_user, class: 'sidebar-user', title: "Profile" do
+        = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s36'
+        .username
+          = current_user.username
   - if defined?(nav) && nav
     .layout-nav
       %div{ class: (container_class) }

app/views/layouts/header/_default.html.haml

@@ -1,4 +1,4 @@
-%header.navbar.navbar-fixed-top.navbar-gitlab.header-collapsed
+%header.navbar.navbar-fixed-top.navbar-gitlab.header-collapsed{ class: nav_header_class }
   %div{ class: fluid_layout ? "container-fluid" : "container-fluid" }
     .header-content
       %button.side-nav-toggle{type: 'button'}

app/views/layouts/nav/_admin.html.haml

@@ -29,11 +29,13 @@
       = icon('cog fw')
       %span
         Runners
+        %span.count= number_with_delimiter(Ci::Runner.count(:all))
   = nav_link path: 'builds#index' do
     = link_to admin_builds_path, title: 'Builds' do
       = icon('link fw')
       %span
         Builds
+        %span.count= number_with_delimiter(Ci::Build.count(:all))
   = nav_link(controller: :logs) do
     = link_to admin_logs_path, title: 'Logs' do
       = icon('file-text fw')
@@ -88,6 +90,7 @@
       = icon('exclamation-circle fw')
       %span
         Abuse Reports
+        %span.count= number_with_delimiter(AbuseReport.count(:all))
 
   - if askimet_enabled?
     = nav_link(controller: :spam_logs) do
@@ -95,6 +98,7 @@
         = icon('exclamation-triangle fw')
         %span
           Spam Logs
+          %span.count= number_with_delimiter(SpamLog.count(:all))
 
   = nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do
     = link_to admin_application_settings_path, title: 'Settings' do

app/views/layouts/nav/_dashboard.html.haml

@@ -9,6 +9,7 @@
       = icon('bell fw')
       %span
         Todos
+        %span.count= number_with_delimiter(todos_pending_count)
   = nav_link(path: 'dashboard#activity') do
     = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do
       = navbar_icon('activity')
@@ -29,11 +30,13 @@
       = navbar_icon('issues')
       %span
         Issues
+        %span.count= number_with_delimiter(current_user.assigned_issues.opened.count)
   = nav_link(path: 'dashboard#merge_requests') do
     = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do
       = navbar_icon('mr')
       %span
         Merge Requests
+        %span.count= number_with_delimiter(current_user.assigned_merge_requests.opened.count)
   = nav_link(controller: :snippets) do
     = link_to dashboard_snippets_path, title: 'Snippets' do
       = icon('clipboard fw')