scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-26 09:43:29 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix CSS issues label printer and label templates and setting pages [SCI-8371]

Browse source
This commit is contained in:
sboursen-scinote 2023-05-09 11:20:53 +02:00
parent 783d5d03ab
commit 1624941c03
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/stylesheets/label_templates/index.scss
View file

@ -94,8 +94,7 @@
} }
.label-template-name { .label-template-name {
align-items: center; vertical-align: middle;
display: flex;
} }
.label-template-icon { .label-template-icon {

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

@ -67,6 +67,10 @@
li:last-child { li:last-child {
padding-bottom: 0; padding-bottom: 0;
} }
.zebra-printers {
color: $color-silver-chalice;
}
} }
.zebra-status-tag { .zebra-status-tag {

3
app/helpers/user_settings_helper.rb
View file

@ -15,7 +15,8 @@ module UserSettingsHelper
end end
def on_settings_account_addons_page? def on_settings_account_addons_page?
controller_name == 'addons' controller_name == 'addons' ||
(controller_name == 'label_printers' && action_name == 'index_zebra')
end end
def on_settings_team_page? def on_settings_team_page?

4
app/views/users/settings/account/addons/index.html.erb
View file

@ -5,10 +5,10 @@
<div class="tab-content user-account-addons"> <div class="tab-content user-account-addons">
<div class="tab-pane content-pane active" role="tabpanel"> <div class="tab-pane content-pane active" role="tabpanel">
<div class="row"> <div>
<h1 class="addons-title"><%= t('users.settings.account.addons.title') %></h1> <h1 class="addons-title"><%= t('users.settings.account.addons.title') %></h1>
<div class="col-xs-12 col-sm-12"> <div>
<h2 class="addons-subtitle" ><%= t('users.settings.account.addons.scinote_addons') %></h2> <h2 class="addons-subtitle" ><%= t('users.settings.account.addons.scinote_addons') %></h2>
<div data-hook="settings-addons-container"> <div data-hook="settings-addons-container">
<em data-hook="settings-addons-no-addons"> <em data-hook="settings-addons-no-addons">