From 49ac9a20d82c4a832773531c4c31d50c9aef3a64 Mon Sep 17 00:00:00 2001 From: sboursen-scinote Date: Fri, 23 Jun 2023 15:31:24 +0200 Subject: [PATCH] Fix folders style in table archived view [SCI-8729] Co-authored-by: Sboursen --- app/assets/stylesheets/projects.scss | 2 +- app/views/projects/index/_folder_card.html.erb | 4 +++- app/views/projects/index/_project_card.html.erb | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index 97a2c1ec8..e4e0b2d39 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -1172,7 +1172,7 @@ li.module-hover { .card { &.folder-card { .name { - grid-column: 7 span; + grid-column: 1 span; } } diff --git a/app/views/projects/index/_folder_card.html.erb b/app/views/projects/index/_folder_card.html.erb index 196694a06..a87612559 100644 --- a/app/views/projects/index/_folder_card.html.erb +++ b/app/views/projects/index/_folder_card.html.erb @@ -27,7 +27,9 @@ <% end %> - <% 5.times do %> + <%# match the number of columns in projects %> + <% additional_columns = folder.archived_branch? ? 6 : 5 %> + <% additional_columns.times do %>
<% end %> diff --git a/app/views/projects/index/_project_card.html.erb b/app/views/projects/index/_project_card.html.erb index 75a0f1bf2..100a91df6 100644 --- a/app/views/projects/index/_project_card.html.erb +++ b/app/views/projects/index/_project_card.html.erb @@ -8,7 +8,8 @@ -
+ +
<%= project.code %>
@@ -30,6 +31,7 @@ <% end %> <% end %>
+