diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-31 18:26:05 +0000 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2017-04-03 12:44:54 +0200 |
| commit | e719c46b3f6520099bf66a9479c93fbf6a30c35a (patch) | |
| tree | a6145ecab252ea83f3936fd5768bc67559515a92 | |
| parent | 4c82269fa98d8ef6a1d50b6552d9769392115e4c (diff) | |
| download | gitlab-ce-e719c46b3f6520099bf66a9479c93fbf6a30c35a.tar.gz | |
Merge branch '30276-move-top-badges' into 'master'
30276 Move issue, mr, todos next to profile dropdown in top nav
Closes #30276
See merge request !10347
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/30276-move-top-badges.yml | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 6f4f2dbea3a..f4ab7392be8 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -31,11 +31,6 @@ %li = link_to admin_root_path, title: 'Admin Area', aria: { label: "Admin Area" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = icon('wrench 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) - 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 @@ -45,6 +40,11 @@ = 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" diff --git a/changelogs/unreleased/30276-move-top-badges.yml b/changelogs/unreleased/30276-move-top-badges.yml new file mode 100644 index 00000000000..68a8ab359fd --- /dev/null +++ b/changelogs/unreleased/30276-move-top-badges.yml @@ -0,0 +1,4 @@ +--- +title: Move issue, mr, todos next to profile dropdown in top nav +merge_request: +author: |