diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 13:16:36 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 13:16:36 +0000 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/views/dashboard/todos | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) | |
download | gitlab-ce-311b0269b4eb9839fa63f80c8d7a58f32b8138a0.tar.gz |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/views/dashboard/todos')
-rw-r--r-- | app/views/dashboard/todos/index.html.haml | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml index 58f817bf63b..aa54a1e589e 100644 --- a/app/views/dashboard/todos/index.html.haml +++ b/app/views/dashboard/todos/index.html.haml @@ -10,19 +10,13 @@ - if current_user.todos.any? .top-area - %ul.nav-links.mobile-separator.nav.nav-tabs - %li.todos-pending{ class: active_when(params[:state].blank? || params[:state] == 'pending') }> - = link_to todos_filter_path(state: 'pending') do - %span - To Do - %span.badge.gl-tab-counter-badge.badge-muted.badge-pill.gl-badge.sm - = number_with_delimiter(todos_pending_count) - %li.todos-done{ class: active_when(params[:state] == 'done') }> - = link_to todos_filter_path(state: 'done') do - %span - Done - %span.badge.gl-tab-counter-badge.badge-muted.badge-pill.gl-badge.sm - = number_with_delimiter(todos_done_count) + = gl_tabs_nav({ class: 'gl-flex-grow-1 gl-border-0' }) do + = gl_tab_link_to todos_filter_path(state: 'pending'), item_active: params[:state].blank? || params[:state] == 'pending', class: "js-todos-pending" do + = _("To Do") + = gl_tab_counter_badge number_with_delimiter(todos_pending_count) + = gl_tab_link_to todos_filter_path(state: 'done'), item_active: params[:state] == 'done', class: "js-todos-done" do + = _("Done") + = gl_tab_counter_badge number_with_delimiter(todos_done_count) .nav-controls - if @allowed_todos.any?(&:pending?) |