scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2026-01-07 00:36:08 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix multiple issues for Shared tasks feature [SCI-8985] (#5936)

Browse source 
- Centre vertically all related modals
- Convert task header tabs to sentence case
This commit is contained in:
Soufiane 2023-08-10 09:43:31 +02:00 • committed by GitHub
parent 0224f420b1
commit aedd3e0b6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/stylesheets/extend/bootstrap.scss vendored
View file

@ -117,6 +117,14 @@
}
}
.centered-modal.in {
display: flex !important;
.modal-dialog {
margin: auto;
}
}
.modal-content {
.modal-header {
padding: 10px 15px;

2
app/javascript/vue/shareable_links/components/delete_shareable_link.vue
View file

@ -1,5 +1,5 @@
<template>
<div ref="modal" class="modal" id="modalDestroyShareableLink" tabindex="-1" role="dialog">
<div ref="modal" class="modal centered-modal" id="modalDestroyShareableLink" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">

2
app/javascript/vue/shareable_links/components/shareable_link_modal.vue
View file

@ -2,7 +2,7 @@
<div>
<div
ref="modal"
class="modal fade share-task-modal"
class="modal fade share-task-modal centered-modal"
id="share-task-modal"
tabindex="-1"
role="dialog"

10
app/views/my_modules/_header_actions.html.erb
View file

@ -1,13 +1,13 @@
<div class="header-actions">
<div class="flex items-center uppercase text-bold">
<div class="flex items-center text-bold">
<% if can_read_experiment?(@my_module.experiment) %>
<a class="p-4 border-b-4 border-transparent hover:no-underline capitalize <%= is_module_protocols? ? "text-sn-blue" : "text-sn-grey" %>"
<a class="p-4 border-b-4 border-transparent hover:no-underline first-letter:capitalize <%= is_module_protocols? ? "text-sn-blue" : "text-sn-grey" %>"
href="<%= protocols_my_module_url(@my_module) %>"
title="<%= t("nav2.modules.steps") %>"
>
<%=t "nav2.modules.steps" %>
</a>
<a class="p-4 border-b-4 border-transparent hover:no-underline capitalize <%= is_module_results? ? "text-sn-blue" : "text-sn-grey" %>"
<a class="p-4 border-b-4 border-transparent hover:no-underline first-letter:capitalize <%= is_module_results? ? "text-sn-blue" : "text-sn-grey" %>"
href="<%= results_my_module_url(@my_module) %>"
title="<%= t("nav2.modules.results") %>"
>
@ -17,7 +17,7 @@
<sup class="navigation-results-counter"><%= @my_module.archived_branch? ? @my_module.results.size : @active_results_size %></sup>
<% end %>
</a>
<a class="p-4 border-b-4 border-transparent hover:no-underline capitalize <%= is_module_activities? ? "text-sn-blue" : "text-sn-grey" %>"
<a class="p-4 border-b-4 border-transparent hover:no-underline first-letter:capitalize <%= is_module_activities? ? "text-sn-blue" : "text-sn-grey" %>"
href="<%= activities_my_module_url(@my_module, view_mode: params[:view_mode]) %>"
title="<%= t("nav2.modules.activities") %>"
>
@ -27,7 +27,7 @@
<div data-hook="secondary-navigation-tabs"></div>
<% if can_read_experiment?(@my_module.experiment) && !@my_module.archived_branch? %>
<a class="p-4 border-b-4 border-transparent hover:no-underline capitalize <%= is_module_archive? ? "text-sn-blue" : "text-sn-grey" %>"
<a class="p-4 border-b-4 border-transparent hover:no-underline first-letter:capitalize <%= is_module_archive? ? "text-sn-blue" : "text-sn-grey" %>"
href="<%= archive_my_module_url(@my_module) %>"
title="<%= t'nav2.modules.archive' %>"
>

2
app/views/shareable_links/my_modules/_welcome_modal.html.erb
View file

@ -1,4 +1,4 @@
<div class="modal" id="shareable-link-welcome-modal" tabindex="-1" role="dialog" aria-labelledby="shareable-link-welcome-modal-label">
<div class="modal in centered-modal" id="shareable-link-welcome-modal" tabindex="-1" role="dialog" aria-labelledby="shareable-link-welcome-modal-label">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">

2
app/views/users/settings/teams/_destroy_tasks_sharing_modal.html.erb
View file

@ -1,4 +1,4 @@
<div class="modal fade" id="team-sharing-tasks" tabindex="-1" role="dialog" aria-labelledby="team-sharing-tasks-label">
<div class="modal fade centered-modal" id="team-sharing-tasks" tabindex="-1" role="dialog" aria-labelledby="team-sharing-tasks-label">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">