From 1624941c03b00778a15e0ef894db7f07efa3d866 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 9 May 2023 11:20:53 +0200
Subject: [PATCH] Fix CSS issues label printer and label templates and setting
 pages [SCI-8371]

---
 app/assets/stylesheets/label_templates/index.scss      | 3 +--
 app/assets/stylesheets/settings/label_printers.scss    | 4 ++++
 app/helpers/user_settings_helper.rb                    | 3 ++-
 app/views/users/settings/account/addons/index.html.erb | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

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 @@
 <div class="tab-content user-account-addons">
   <div class="tab-pane content-pane active" role="tabpanel">
 
-    <div class="row">
+    <div>
       <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>
         <div data-hook="settings-addons-container">
           <em data-hook="settings-addons-no-addons">