Merge branch 'nice-todos-bell' into 'master'

Add nice new Todo bell ![H5bp___Html5_Boilerplate___GitLab](/uploads/e8725396a5d77a8db09742f977595605/H5bp___Html5_Boilerplate___GitLab.png) ![H5bp___Html5_Boilerplate___GitLab](/uploads/011a21ee1653502c4f78543e28d97b67/H5bp___Html5_Boilerplate___GitLab.png) ![H5bp___Html5_Boilerplate___GitLab](/uploads/0858cb9621463ef6a32237fcb0b4f63d/H5bp___Html5_Boilerplate___GitLab.png) Fixes: #15671 See merge request !4077

Merge branch 'nice-todos-bell' into 'master'
ecd7c1d2 · Dmitriy Zaporozhets · 27ae0684 · 510b1058 · ecd7c1d2 · ecd7c1d2
Commit ecd7c1d2 authored May 06, 2016 by Dmitriy Zaporozhets
Showing with 10 additions and 1 deletion

variables.scss app/assets/stylesheets/framework/variables.scss +1 -0

todos.scss app/assets/stylesheets/pages/todos.scss +8 -1

_default.html.haml app/views/layouts/header/_default.html.haml +1 -0

No files found.
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -77,6 +77,7 @@ $provider-btn-group-border: #e5e5e5;
 $provider-btn-not-active-color: #4688f1;
 $link-underline-blue: #4a8bee;
 $layout-link-gray: #7e7c7c;
+$todo-alert-blue: #428bca;

 /*
 * Color schema

--- a/app/assets/stylesheets/pages/todos.scss
+++ b/app/assets/stylesheets/pages/todos.scss
@@ -6,9 +6,16 @@
 .navbar-nav {
  li {
    .badge.todos-pending-count {
-      background-color: $gl-icon-color;
      margin-top: -5px;
      font-weight: normal;
+      background: $todo-alert-blue;
+      margin-left: -17px;
+      font-size: 11px;
+      color: white;
+      padding: 3px;
+      padding-top: 1px;
+      padding-bottom: 1px;
+      border-radius: 3px;
    }
  }
 }

--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -23,6 +23,7 @@
                  = icon('wrench fw')
            %li
              = link_to dashboard_todos_path, title: 'Todos', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
+                = icon('bell fw')
                %span.badge.todos-pending-count
                  = todos_pending_count
            - if current_user.can_create_project?