From 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 18 Jan 2023 19:00:14 +0000
Subject: Add latest changes from gitlab-org/gitlab@15-8-stable-ee

---
 app/views/dashboard/todos/_todo.html.haml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'app/views/dashboard')

diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml
index 9dfeaa3d07d..f97c0e2b9b6 100644
--- a/app/views/dashboard/todos/_todo.html.haml
+++ b/app/views/dashboard/todos/_todo.html.haml
@@ -1,7 +1,7 @@
 %li.todo.gl-hover-border-blue-200.gl-hover-bg-blue-50.gl-hover-cursor-pointer.gl-relative{ class: "todo-#{todo.done? ? 'done' : 'pending'}", id: dom_id(todo) }
   .gl-display-flex.gl-flex-direction-column.gl-sm-flex-direction-row.gl-sm-align-items-center
     .todo-item.gl-overflow-hidden.gl-overflow-x-auto.gl-align-self-center.gl-w-full{ data: { qa_selector: "todo_item_container" } }
-      .todo-title.gl-pt-2.gl-pb-3.gl-px-2.gl-md-mb-1.gl-font-sm.gl-text-gray-500
+      .todo-title.gl-pt-2.gl-pb-3.gl-px-2.gl-md-mb-1.gl-font-sm.gl-text-secondary
 
         = todo_target_state_pill(todo)
 
@@ -16,7 +16,7 @@
 
         %span.todo-label
           - if todo.target
-            = link_to todo_target_name(todo), todo_target_path(todo), class: 'todo-target-link gl-text-gray-500! gl-text-decoration-none!', :'aria-describedby' => dom_id(todo) + "_describer", :'aria-label' => todo_target_aria_label(todo)
+            = link_to todo_target_name(todo), todo_target_path(todo), class: 'todo-target-link gl-text-secondary! gl-text-decoration-none!', :'aria-describedby' => dom_id(todo) + "_describer", :'aria-label' => todo_target_aria_label(todo)
           - else
             = _("(removed)")
 
@@ -25,29 +25,30 @@
           = author_avatar(todo, size: 24)
         .todo-note
           - if todo_author_display?(todo)
-            .author-name.bold.gl-display-inline
+            .author-name.bold.gl-display-inline<
               - if todo.author
                 = link_to_author(todo, self_added: todo.self_added?)
               - else
                 = _('(removed)')
+              - if todo.note.present?
+                \:
 
           %span.action-name{ data: { qa_selector: "todo_action_name_content" } }<
-            = todo_action_name(todo)
-            - if todo.note.present?
-              \:
-            - unless todo.note.present? || todo.self_assigned?
-              \.
+            - if !todo.note.present?
+              = todo_action_name(todo)
+              - unless todo.self_assigned?
+                \.
 
           - if todo.self_assigned?
             %span.action-name<
               = todo_self_addressing(todo)
               \.
           - if todo.note.present?
-            %span.action-description.gl-font-style-italic<
-              = first_line_in_markdown(todo, :body, 100, is_todo: true, project: todo.project, group: todo.group)
+            %span.action-description<
+            = first_line_in_markdown(todo, :body, 125, is_todo: true, project: todo.project, group: todo.group)
 
     .todo-timestamp.gl-white-space-nowrap.gl-sm-ml-3.gl-mt-2.gl-mb-2.gl-sm-my-0.gl-px-2.gl-sm-px-0
-      %span.todo-timestamp.gl-font-sm.gl-text-gray-500
+      %span.todo-timestamp.gl-font-sm.gl-text-secondary
         = todo_due_date(todo)
         #{time_ago_with_tooltip(todo.created_at)}
 
-- 
cgit v1.2.3