Commit 781e5969 authored by Peter Hegman's avatar Peter Hegman

Merge branch 'fix/todo-list-allignment' into 'master'

Alignment issue for for empty todo-list

See merge request gitlab-org/gitlab!77881
parents 98f503cd 31272ff1
...@@ -80,28 +80,28 @@ ...@@ -80,28 +80,28 @@
.js-nothing-here-container.empty-state.hidden .js-nothing-here-container.empty-state.hidden
.svg-content .svg-content
= image_tag 'illustrations/todos_all_done.svg' = image_tag 'illustrations/todos_all_done.svg'
.text-content .text-content.gl-text-center
%h4.text-center %h4
= s_("Todos|You're all done!") = s_("Todos|You're all done!")
- elsif current_user.todos.any? - elsif current_user.todos.any?
.col.todos-all-done.empty-state .col.todos-all-done.empty-state
.svg-content.svg-250 .svg-content.svg-250
= image_tag 'illustrations/todos_all_done.svg' = image_tag 'illustrations/todos_all_done.svg'
.text-content .text-content.gl-text-center
- if todos_filter_empty? - if todos_filter_empty?
%h4.text-center %h4
= Gitlab.config.gitlab.no_todos_messages.sample = Gitlab.config.gitlab.no_todos_messages.sample
%p %p
= (s_("Todos|Are you looking for things to do? Take a look at %{strongStart}%{openIssuesLinkStart}open issues%{openIssuesLinkEnd}%{strongEnd}, contribute to %{strongStart}%{mergeRequestLinkStart}a merge request%{mergeRequestLinkEnd}%{mergeRequestLinkEnd}%{strongEnd}, or mention someone in a comment to automatically assign them a new to-do item.") % { strongStart: '<strong>', strongEnd: '</strong>', openIssuesLinkStart: "<a href=\"#{issues_dashboard_path}\">", openIssuesLinkEnd: '</a>', mergeRequestLinkStart: "<a href=\"#{merge_requests_dashboard_path}\">", mergeRequestLinkEnd: '</a>' }).html_safe = (s_("Todos|Are you looking for things to do? Take a look at %{strongStart}%{openIssuesLinkStart}open issues%{openIssuesLinkEnd}%{strongEnd}, contribute to %{strongStart}%{mergeRequestLinkStart}a merge request%{mergeRequestLinkEnd}%{mergeRequestLinkEnd}%{strongEnd}, or mention someone in a comment to automatically assign them a new to-do item.") % { strongStart: '<strong>', strongEnd: '</strong>', openIssuesLinkStart: "<a href=\"#{issues_dashboard_path}\">", openIssuesLinkEnd: '</a>', mergeRequestLinkStart: "<a href=\"#{merge_requests_dashboard_path}\">", mergeRequestLinkEnd: '</a>' }).html_safe
- else - else
%h4.text-center %h4
= s_("Todos|Nothing is on your to-do list. Nice work!") = s_("Todos|Nothing is on your to-do list. Nice work!")
- else - else
.col.empty-state .col.empty-state
.svg-content .svg-content
= image_tag 'illustrations/todos_empty.svg' = image_tag 'illustrations/todos_empty.svg'
.text-content .text-content.gl-text-center
%h4.text-center %h4
= s_("Todos|Your To-Do List shows what to work on next") = s_("Todos|Your To-Do List shows what to work on next")
%p %p
= (s_("Todos|When an issue or merge request is assigned to you, or when you receive a %{strongStart}@mention%{strongEnd} in a comment, this automatically triggers a new item in your To-Do List.") % { strongStart: '<strong>', strongEnd: '</strong>' }).html_safe = (s_("Todos|When an issue or merge request is assigned to you, or when you receive a %{strongStart}@mention%{strongEnd} in a comment, this automatically triggers a new item in your To-Do List.") % { strongStart: '<strong>', strongEnd: '</strong>' }).html_safe
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment