Fix layout of countersmr-shortcuts-counters-stable

2 files changed, 12 insertions, 14 deletions

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 6841adb637e..7e68cd52ec2 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -29,10 +29,12 @@ $gray-darkest: #c4c4c4;
 $green-light: #3cbd70;
 $green-normal: darken($green-light, $darken-normal-factor);
 $green-dark: darken($green-light, $darken-dark-factor);
+$green-500: #1aaa55;
 
 $blue-light: #2ea8e5;
 $blue-normal: darken($blue-light, $darken-normal-factor);
 $blue-dark: darken($blue-light, $darken-dark-factor);
+$blue-500: #1f78d1;
 
 $blue-medium-light: #3498cb;
 $blue-medium: darken($blue-medium-light, $darken-normal-factor);
@@ -43,6 +45,7 @@ $blue-light-transparent: rgba(44, 159, 216, 0.05);
 $orange-light: #fc8a51;
 $orange-normal: darken($orange-light, $darken-normal-factor);
 $orange-dark: darken($orange-light, $darken-dark-factor);
+$orange-600: #de7e00;
 
 $red-light: #e52c5a;
 $red-normal: darken($red-light, $darken-normal-factor);
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 0186059fffb..b31a461a145 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -28,6 +28,15 @@
               %li
                 = link_to admin_root_path, title: 'Admin Area', aria: { label: "Admin Area" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
                   = icon('wrench fw')
+            - if current_user.can_create_project?
+              %li
+                = link_to new_project_path, title: 'New project', aria: { label: "New project" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
+                  = icon('plus fw')
+            - if Gitlab::Sherlock.enabled?
+              %li
+                = link_to sherlock_transactions_path, title: 'Sherlock Transactions',
+                  data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
+                  = icon('tachometer fw')
             %li
               = link_to assigned_issues_dashboard_path, title: 'Issues', aria: { label: "Issues" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
                 = icon('hashtag fw')
@@ -43,20 +52,6 @@
                 = icon('check-circle fw')
                 %span.badge.todos-count
                   = todos_count_format(todos_pending_count)
-            - if current_user.can_create_project?
-              %li
-                = link_to new_project_path, title: 'New project', aria: { label: "New project" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
-                  = icon('plus fw')
-            - if Gitlab::Sherlock.enabled?
-              %li
-                = link_to sherlock_transactions_path, title: 'Sherlock Transactions',
-                  data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
-                  = icon('tachometer fw')
-            %li
-              = link_to dashboard_todos_path, title: 'Todos', aria: { label: "Todos" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
-                = icon('bell fw')
-                %span.badge.todos-pending-count{ class: ("hidden" if todos_pending_count == 0) }
-                  = todos_count_format(todos_pending_count)
             %li.header-user.dropdown
               = link_to current_user, class: "header-user-dropdown-toggle", data: { toggle: "dropdown" } do
                 = image_tag avatar_icon(current_user, 26), width: 26, height: 26, class: "header-user-avatar"