kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
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
This commit is contained in:
Dmitriy Zaporozhets 2016-05-06 16:37:40 +00:00
commit ecd7c1d25a
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/framework/variables.scss
View file

@ -77,6 +77,7 @@ $provider-btn-group-border: #e5e5e5;
$provider-btn-not-active-color: #4688f1; $provider-btn-not-active-color: #4688f1;
$link-underline-blue: #4a8bee; $link-underline-blue: #4a8bee;
$layout-link-gray: #7e7c7c; $layout-link-gray: #7e7c7c;
$todo-alert-blue: #428bca;
/* /*
* Color schema * Color schema

9
app/assets/stylesheets/pages/todos.scss
View file

@ -6,9 +6,16 @@
.navbar-nav { .navbar-nav {
li { li {
.badge.todos-pending-count { .badge.todos-pending-count {
background-color: $gl-icon-color;
margin-top: -5px; margin-top: -5px;
font-weight: normal; 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;
} }
} }
} }

1
app/views/layouts/header/_default.html.haml
View file

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