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

Merge pull request #4841 from sboursen-scinote/sb_SCI-7737

Browse source 
Fix: Incorrect icons & double scrollbar displayed when resizing the window [SCI-7737]
This commit is contained in:
artoscinote 2023-01-17 09:44:12 +01:00 committed by GitHub
parent fd4fb6852a 3a185ae416
commit cc4a8bf8be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/stylesheets/experiment/table.scss
View file

@ -459,3 +459,11 @@
}
}
}
@media (max-width: 1000px) {
.toolbar-row {
.button-text {
display: none;
}
}
}

12
app/views/experiments/_table_toolbar.html.erb
View file

@ -12,31 +12,31 @@
<% end %>
<button id="editTask" class="btn btn-light single-object-action hidden only-active" data-for="editable" >
<i class="fas fa-pen"></i>
<%= t("experiments.table.toolbar.edit") %>
<span class="button-text"><%= t("experiments.table.toolbar.edit") %></span>
</button>
<% if can_manage_experiment?(@experiment) %>
<button id="duplicateTasks" class="btn btn-light multiple-object-action hidden only-active" data-url="<%= batch_clone_my_modules_experiment_path(@experiment) %>">
<i class="fas fa-copy"></i>
<%= t("experiments.table.toolbar.duplicate") %>
<span class="button-text"><%= t("experiments.table.toolbar.duplicate") %></span>
</button>
<% end %>
<button id="moveTask" class="btn btn-light multiple-object-action hidden only-active" data-for="moveable">
<i class="fas fa-arrow-right"></i>
<%= t("experiments.table.toolbar.move") %>
<span class="button-text"><%= t("experiments.table.toolbar.move") %></span>
</button>
<button id="archiveTask" class="btn btn-light multiple-object-action hidden only-active" data-url="<%= archive_my_modules_experiment_path(@experiment) %>" data-for="archivable">
<i class="fas fa-archive"></i>
<%= t("experiments.table.toolbar.archive") %>
<span class="button-text"><%= t("experiments.table.toolbar.archive") %></span>
</button>
<button id="restoreTask" class="btn btn-light multiple-object-action hidden only-archive" data-url="<%= restore_my_modules_experiment_path(@experiment) %>" data-for="restorable">
<i class="fas fa-undo"></i>
<%= t("experiments.table.toolbar.restore") %>
<span class="button-text"><%= t("experiments.table.toolbar.restore") %></span>
</button>
</div>
<div class="toolbar-right-block">
<button id="taskDataDisplay" class="btn btn-light" data-toggle="modal" data-target="#tableDisplayModal">
<i class="fas fa-eye"></i>
<%= t("experiments.table.toolbar.task_data") %>
<span class="button-text"><%= t("experiments.table.toolbar.task_data") %></span>
</button>
</div>
</div>