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

Fix typo and boostrap load order

Browse source
This commit is contained in:
aignatov-bio 2020-01-08 12:07:33 +01:00
parent 68646276f5
commit 5953c2543d
4 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/assets/stylesheets/application.scss
View file

@ -7,7 +7,18 @@
*= stub reports_pdf *= stub reports_pdf
*/ */
@import "shared_styles/global_elements"; @import "shared_styles/constants/*";
@import "constants";
@import "bootstrap-sprockets";
@import "bootstrap";
@import "bootstrap-datetimepicker";
@import "bootstrap-colorselector";
@import "bootstrap-tagsinput";
@import "bootstrap-tagsinput-typeahead";
@import "shared_styles/elements/*";
@import "handsontable.full.min"; @import "handsontable.full.min";
@import "ajax-bootstrap-select.min"; @import "ajax-bootstrap-select.min";

10
app/assets/stylesheets/shared_styles/global_elements.scss
View file

@ -1,16 +1,6 @@
// scss-lint:disable Comment // scss-lint:disable Comment
@import "constants/*"; @import "constants/*";
@import "../constants";
@import "bootstrap-sprockets";
@import "bootstrap";
@import "bootstrap-datetimepicker";
@import "bootstrap-colorselector";
@import "bootstrap-tagsinput";
@import "bootstrap-tagsinput-typeahead";
@import "elements/*"; @import "elements/*";
// Examples // Examples

4
app/views/reports/new/modal/_experiment_contents_inner.html.erb
View file

@ -8,7 +8,7 @@
<div class="checkbox-tree"> <div class="checkbox-tree">
<ul> <ul>
<li> <li>
<%= form.custom_check_box :experiment_all, label: experiment.name %> <%= form.check_box :experiment_all, label: experiment.name %>
<ul> <ul>
<% experiment.my_module_groups.each do |my_module_group| %> <% experiment.my_module_groups.each do |my_module_group| %>
@ -24,7 +24,7 @@
<!-- Tasks without groups --> <!-- Tasks without groups -->
<% experiment.my_modules.without_group.each do |my_module| %> <% experiment.my_modules.without_group.each do |my_module| %>
<li> <li>
<%= form.custom_check_box "modules[#{my_module.id}]", label: my_module.name %> <%= form.check_box "modules[#{my_module.id}]", label: my_module.name %>
</li> </li>
<% end %> <% end %>

2
app/views/user_my_modules/_index_edit.html.erb
View file

@ -43,7 +43,7 @@
<%= collection_select(:user_my_module, :user_id, @unassigned_users, :id, :full_name, {}, { class: 'selectpicker' }) %> <%= collection_select(:user_my_module, :user_id, @unassigned_users, :id, :full_name, {}, { class: 'selectpicker' }) %>
</div> </div>
<div class="col-xs-2"> <div class="col-xs-2">
<%= f.button class: 'btn btn btn-primary' do %> <%= f.button class: 'btn btn-primary' do %>
<span class="fas fa-plus"></span> <span class="fas fa-plus"></span>
<span class="hidden-xs"><%= t("experiments.canvas.full_zoom.modal_manage_users.create") %></span> <span class="hidden-xs"><%= t("experiments.canvas.full_zoom.modal_manage_users.create") %></span>
<% end %> <% end %>