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

Fix shareable links after develop merge

Browse source
This commit is contained in:
Andrej 2023-07-20 09:37:32 +02:00
parent bbcc900ef5
commit 37d8ac6cd6
4 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/assets/stylesheets/tailwind/inputs.css
View file

@ -45,4 +45,25 @@
.sci-input-container-v2.right-icon input {
@apply pr-10;
}
.sci-input-container-v2.left-icon input {
@apply pl-10;
}
.sci-input-container-v2.textarea-lg {
@apply h-[9rem];
}
.sci-input-container-v2 textarea {
@apply w-full h-full bg-transparent px-2 border rounded outline-none absolute top-0;
border-color: var(--sn-sleepy-grey);
}
.sci-input-container-v2 textarea::placeholder {
color: var(--sn-sleepy-grey);
}
.sci-input-container-v2 textarea:focus {
border-color: var(--sn-science-blue);
}
}

5
app/controllers/teams_controller.rb
View file

@ -70,8 +70,9 @@ class TeamsController < ApplicationController
def disable_tasks_sharing_modal
render json: {
html: render_to_string(
partial: 'users/settings/teams/destroy_tasks_sharing_modal.html.erb',
locals: {}
partial: 'users/settings/teams/destroy_tasks_sharing_modal',
locals: {},
formats: :html
)
}
end

4
app/views/shareable_links/_my_module_details.html.erb
View file

@ -8,7 +8,7 @@
<div id="startDateContainer" class="datetime-container">
<span class="date-text">
<span id="startDateLabelContainer" class="view-block">
<%= render partial: "my_modules/start_date_label.html.erb" , locals: { my_module: @my_module } %>
<%= render partial: "my_modules/start_date_label", locals: { my_module: @my_module } %>
</span>
</span>
</div>
@ -22,7 +22,7 @@
<div id="dueDateContainer" class="datetime-container">
<span class="date-text">
<span id="dueDateLabelContainer" class="view-block">
<%= render partial: "my_modules/due_date_label.html.erb" , locals: { my_module: @my_module, due_date_editable: false } %>
<%= render partial: "my_modules/due_date_label", locals: { my_module: @my_module, due_date_editable: false } %>
</span>
</span>
</div>

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

@ -6,8 +6,8 @@
<h4 class="modal-title" id="team-sharing-tasks-label"><%= t("users.settings.teams.show.tasks_share.disable_modal.title") %></h4>
</div>
<div class="modal-body">
<p><%= t("users.settings.teams.show.tasks_share.disable_modal.description_p1", {team_name: @team.name}) %></p>
<p><%= t("users.settings.teams.show.tasks_share.disable_modal.description_p2", {counter: @team.number_of_task_shared}) %></p>
<p><%= t("users.settings.teams.show.tasks_share.disable_modal.description_p1", team_name: @team.name) %></p>
<p><%= t("users.settings.teams.show.tasks_share.disable_modal.description_p2", counter: @team.number_of_task_shared) %></p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('general.cancel') %></button>