Merge branch 'projects-list-line-breaks' into 'master'

Fixes project list lines breaking

Closes #29018

See merge request !10178

2 files changed, 31 insertions, 31 deletions

diff --git a/app/views/shared/projects/_list.html.haml b/app/views/shared/projects/_list.html.haml
index c57282c5742..c0699b13719 100644
--- a/app/views/shared/projects/_list.html.haml
+++ b/app/views/shared/projects/_list.html.haml
@@ -10,7 +10,7 @@
 
 .js-projects-list-holder
   - if projects.any?
-    %ul.projects-list.content-list
+    %ul.projects-list
       - projects.each_with_index do |project, i|
         - css_class = (i >= projects_limit) ? 'hide' : nil
         = render "shared/projects/project", project: project, skip_namespace: skip_namespace,
diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml
index df21857e1ad..059aeebaf34 100644
--- a/app/views/shared/projects/_project.html.haml
+++ b/app/views/shared/projects/_project.html.haml
@@ -10,44 +10,44 @@
 
 %li.project-row{ class: css_class }
   = cache(cache_key) do
+    - if avatar
+      .avatar-container.s40
+        - if use_creator_avatar
+          = image_tag avatar_icon(project.creator.email, 40), class: "avatar s40", alt:''
+        - else
+          = project_icon(project, alt: '', class: 'avatar project-avatar s40')
+    .project-details
+      %h3.prepend-top-0.append-bottom-0
+        = link_to project_path(project), class: dom_class(project) do
+          %span.project-full-name
+            %span.namespace-name
+              - if project.namespace && !skip_namespace
+                = project.namespace.human_name
+                \/
+            %span.project-name.filter-title
+              = project.name
+
+      - if show_last_commit_as_description
+        .description.prepend-top-5
+          = link_to_gfm project.commit.title, namespace_project_commit_path(project.namespace, project, project.commit),
+            class: "commit-row-message"
+      - elsif project.description.present?
+        .description.prepend-top-5
+          = markdown_field(project, :description)
+
     .controls
       - if project.archived
-        %span.label.label-warning archived
+        %span.prepend-left-10.label.label-warning archived
       - if project.pipeline_status.has_status?
-        %span
+        %span.prepend-left-10
           = render_project_pipeline_status(project.pipeline_status)
       - if forks
-        %span
+        %span.prepend-left-10
           = icon('code-fork')
           = number_with_delimiter(project.forks_count)
       - if stars
-        %span
+        %span.prepend-left-10
           = icon('star')
           = number_with_delimiter(project.star_count)
-      %span.visibility-icon.has-tooltip{ data: { container: 'body', placement: 'left' }, title: visibility_icon_description(project) }
+      %span.prepend-left-10.visibility-icon.has-tooltip{ data: { container: 'body', placement: 'left' }, title: visibility_icon_description(project) }
         = visibility_level_icon(project.visibility_level, fw: true)
-
-    .title
-      = link_to project_path(project), class: dom_class(project) do
-        - if avatar
-          .dash-project-avatar
-            .avatar-container.s40
-              - if use_creator_avatar
-                = image_tag avatar_icon(project.creator.email, 40), class: "avatar s40", alt:''
-              - else
-                = project_icon(project, alt: '', class: 'avatar project-avatar s40')
-        %span.project-full-name
-          %span.namespace-name
-            - if project.namespace && !skip_namespace
-              = project.namespace.human_name
-              \/
-          %span.project-name.filter-title
-            = project.name
-
-    - if show_last_commit_as_description
-      .description
-        = link_to_gfm project.commit.title, namespace_project_commit_path(project.namespace, project, project.commit),
-          class: "commit-row-message"
-    - elsif project.description.present?
-      .description
-        = markdown_field(project, :description)