scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-26 09:42:46 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5344 from sboursen-scinote/sb_SCI-8347

Browse source 
FIle/step dropdown is out of task border [SCI-8347]
This commit is contained in:
artoscinote 2023-05-30 13:46:10 +02:00 committed by GitHub
commit 98a27b083a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/my_modules/protocols/index.scss
View file

@ -42,6 +42,12 @@
padding: 10px;
z-index: 2;
}
.dropdown {
.dropdown-menu {
z-index: 9;
}
}
}
.content-pane.protocols-repository-edit-view {

5
app/assets/stylesheets/my_modules/results/index.scss
View file

@ -10,6 +10,10 @@
align-items: center;
display: flex;
.dropdown-menu {
z-index: 9;
}
.add-result-dropdown {
li {
cursor: pointer;
@ -80,3 +84,4 @@
flex-direction: column;
}
}

2
app/views/my_modules/archive/_result.html.erb
View file

@ -8,7 +8,7 @@
<li>
<% option_text = t("my_modules.module_archive.option_download") %>
<% if result.is_asset %>
<%= link_to t('protocols.index.archive_results.preview'), rails_blob_path(result.asset.file, disposition: 'attachment'),
<%= link_to t('my_modules.archive_results.preview'), rails_blob_path(result.asset.file, disposition: 'attachment'),
class: 'file-preview-link',
id: "modal_link#{result.asset.id}",
data: { turbolinks: false, id: true, status: 'asset-present', 'preview-url': asset_file_preview_path(result.asset) } %>

2
config/locales/en.yml
View file

@ -1212,6 +1212,8 @@ en:
new_comment: "New comment"
edit_title: "Edit result"
archive_title: "Archive result"
archive_results:
preview: "View"
activities:
head_title: "%{project} | %{module} | Activity"
no_activities: "There are no activities for this task."