diff --git a/app/assets/stylesheets/label_templates/index.scss b/app/assets/stylesheets/label_templates/index.scss index d7da963d5..63a009f72 100644 --- a/app/assets/stylesheets/label_templates/index.scss +++ b/app/assets/stylesheets/label_templates/index.scss @@ -94,8 +94,7 @@ } .label-template-name { - align-items: center; - display: flex; + vertical-align: middle; } .label-template-icon { diff --git a/app/assets/stylesheets/settings/label_printers.scss b/app/assets/stylesheets/settings/label_printers.scss index 733c55ae6..787fffc60 100644 --- a/app/assets/stylesheets/settings/label_printers.scss +++ b/app/assets/stylesheets/settings/label_printers.scss @@ -67,6 +67,10 @@ li:last-child { padding-bottom: 0; } + + .zebra-printers { + color: $color-silver-chalice; + } } .zebra-status-tag { diff --git a/app/helpers/user_settings_helper.rb b/app/helpers/user_settings_helper.rb index 2af268f64..50949447a 100644 --- a/app/helpers/user_settings_helper.rb +++ b/app/helpers/user_settings_helper.rb @@ -15,7 +15,8 @@ module UserSettingsHelper end def on_settings_account_addons_page? - controller_name == 'addons' + controller_name == 'addons' || + (controller_name == 'label_printers' && action_name == 'index_zebra') end def on_settings_team_page? diff --git a/app/views/users/settings/account/addons/index.html.erb b/app/views/users/settings/account/addons/index.html.erb index 1d51335cb..5d46271ef 100644 --- a/app/views/users/settings/account/addons/index.html.erb +++ b/app/views/users/settings/account/addons/index.html.erb @@ -5,10 +5,10 @@