scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-24 22:16:24 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5671 from sboursen-scinote/sb_SCI-8729

Browse source 
Archived view broken after folder [SCI-8729]
This commit is contained in:
artoscinote 2023-06-26 11:55:08 +02:00 • committed by GitHub
commit ec3e8a20cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/projects.scss
View file

@ -1172,7 +1172,7 @@ li.module-hover {
.card {
&.folder-card {
.name {
grid-column: 7 span;
grid-column: 1 span;
}
}

4
app/views/projects/index/_folder_card.html.erb
View file

@ -27,7 +27,9 @@
</div>
<% end %>
<% 5.times do %>
<%# match the number of columns in projects %>
<% additional_columns = folder.archived_branch? ? 6 : 5 %>
<% additional_columns.times do %>
<div class="name table-cell">
</div>
<% end %>

4
app/views/projects/index/_project_card.html.erb
View file

@ -8,7 +8,8 @@
<span class="sci-checkbox-label"></span>
</div>
</div>
<div class="project-code-cell table-cell">
<div class="project-code-cell table-cell">
<span><%= project.code %></span>
</div>
@ -30,6 +31,7 @@
<% end %>
<% end %>
</div>
<div class="actions actions-cell table-cell">
<div
class="dropdown dropdown-async project-actions-menu <%= 'new-comments' if has_unseen_comments?(project) %>"