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

Revert "Unified paddings for collapsing content at printers pages [SCI-8787] (#5718)" (#5719)

Browse source 
This reverts commit dbb0e1a50a.
This commit is contained in:
ajugo 2023-07-05 14:20:22 +02:00 • committed by GitHub
parent dbb0e1a50a
commit c8c0a147b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/assets/stylesheets/settings/label_printers.scss
View file

@ -47,12 +47,23 @@
} }
.zebra-settings-collapse { .zebra-settings-collapse {
.collapse-content { border-left: 3px solid $color-concrete;
margin-top: 14px;
padding-bottom: 0;
padding-top: 0;
.collapse {
padding-left: 2.5em;
ol { ol {
padding-left: 1.5em; padding-left: 1.5em;
} }
} }
.collapse-row {
padding-left: 1em;
}
li:last-child { li:last-child {
padding-bottom: 0; padding-bottom: 0;
} }
@ -83,6 +94,10 @@
} }
} }
.collapse {
margin-bottom: 1em;
}
.sn-icon-down { .sn-icon-down {
cursor: pointer; cursor: pointer;
margin-right: .25em; margin-right: .25em;
@ -95,12 +110,10 @@
.collapse-row { .collapse-row {
align-items: center; align-items: center;
display: flex; display: flex;
padding-left: 1em;
} }
.collapse-content { .collapse {
margin-bottom: 1em; padding-left: 1.5em;
padding-left: 2.5em;
} }
.row-title { .row-title {

6
app/views/label_printers/_fluics_settings.html.erb
View file

@ -4,7 +4,7 @@
<i class="sn-icon sn-icon-down" data-toggle="collapse" href="#fluicsInstructionsSection" aria-expanded="false"></i> <i class="sn-icon sn-icon-down" data-toggle="collapse" href="#fluicsInstructionsSection" aria-expanded="false"></i>
<div class="row-title"><%= t("users.settings.account.label_printer.instructions") %></div> <div class="row-title"><%= t("users.settings.account.label_printer.instructions") %></div>
</div> </div>
<ul class="collapse in collapse-content" id="fluicsInstructionsSection"> <ul class="collapse in" id="fluicsInstructionsSection">
<li> <li>
<%= t("users.settings.account.label_printer.fluics_instruction.p1") %> <%= t("users.settings.account.label_printer.fluics_instruction.p1") %>
</li> </li>
@ -28,7 +28,7 @@
<i class="sn-icon sn-icon-down" data-toggle="collapse" href="#SettingsSection" aria-expanded="false"></i> <i class="sn-icon sn-icon-down" data-toggle="collapse" href="#SettingsSection" aria-expanded="false"></i>
<div class="row-title"><%= t("users.settings.account.label_printer.settings") %></div> <div class="row-title"><%= t("users.settings.account.label_printer.settings") %></div>
</div> </div>
<ul class="collapse in collapse-content" id="SettingsSection"> <ul class="collapse in" id="SettingsSection">
<%= form_with scope: :label_printer, url: create_fluics_label_printers_path do |form| %> <%= form_with scope: :label_printer, url: create_fluics_label_printers_path do |form| %>
<div class="api-key-container" data-warning="<%= t("users.settings.account.label_printer.api_key_warning") %>"> <div class="api-key-container" data-warning="<%= t("users.settings.account.label_printer.api_key_warning") %>">
<div class="sci-input-container <%= 'error' if flash[:error] %>" data-error-text="<%= flash[:error] %>"> <div class="sci-input-container <%= 'error' if flash[:error] %>" data-error-text="<%= flash[:error] %>">
@ -63,7 +63,7 @@
</div> </div>
<% end %> <% end %>
</div> </div>
<ul class="collapse in collapse-content" id="PrintersSection"> <ul class="collapse in" id="PrintersSection">
<% if @label_printers.any? %> <% if @label_printers.any? %>
<% @label_printers.each do |printer| %> <% @label_printers.each do |printer| %>
<li> <li>

4
app/views/label_printers/_zebra_settings.html.erb
View file

@ -4,7 +4,7 @@
<i class="sn-icon sn-icon-down collapsed" data-toggle="collapse" href="#zebraInstructionsSection" aria-expanded="false"></i> <i class="sn-icon sn-icon-down collapsed" data-toggle="collapse" href="#zebraInstructionsSection" aria-expanded="false"></i>
<div class="row-title"><%= t("users.settings.account.label_printer.instructions") %></div> <div class="row-title"><%= t("users.settings.account.label_printer.instructions") %></div>
</div> </div>
<ul class="collapse collapse-content" id="zebraInstructionsSection"> <ul class="collapse" id="zebraInstructionsSection">
<li> <li>
<%= t("users.settings.account.label_printer.zebra_instruction.general_html", link: Constants::SCINOTE_ZEBRA_DOWNLOAD_URL) %> <%= t("users.settings.account.label_printer.zebra_instruction.general_html", link: Constants::SCINOTE_ZEBRA_DOWNLOAD_URL) %>
</li> </li>
@ -73,7 +73,7 @@
<% end %> <% end %>
</div> </div>
</div> </div>
<ul class="collapse in zebra-printers collapse-content" id="PrintersSection"></ul> <ul class="collapse in zebra-printers" id="PrintersSection"></ul>
</li> </li>
</ul> </ul>