From 51393210c40d1430685b7b3f2c03d1b369a4814b Mon Sep 17 00:00:00 2001
From: Richa <richa.bisht@suse.com>
Date: Thu, 23 May 2024 11:10:37 +0200
Subject: [PATCH] Added height variable in scss file

---
 java/code/src/com/suse/manager/webui/utils/ViewHelper.java  | 3 ++-
 .../branding/css/susemanager/components/buttons.suma.scss   | 6 +++++-
 web/html/src/branding/css/susemanager/index.scss            | 2 +-
 web/html/src/core/spa/view-helper.ts                        | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
index 54f2aaee026d..b801d7c5ce53 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -67,7 +67,8 @@ public enum ViewHelper {
         "/rhn/account/Addresses.do",
         "/rhn/account/EditAddress.do",
         "/rhn/multiorg/OrgConfigDetails.do",
-        "/rhn/manager/notification-messages"
+        "/rhn/manager/notification-messages",
+        "rhn/channels/software/Search.do"
     );
 
     ViewHelper() { }
diff --git a/web/html/src/branding/css/susemanager/components/buttons.suma.scss b/web/html/src/branding/css/susemanager/components/buttons.suma.scss
index 0a5ad3b96585..2e66a71d2c6b 100644
--- a/web/html/src/branding/css/susemanager/components/buttons.suma.scss
+++ b/web/html/src/branding/css/susemanager/components/buttons.suma.scss
@@ -178,7 +178,7 @@
 .input-group-btn .btn {
   border-width: 1px;
   padding: 6px 12px;
-  height: 35px;
+  height: $input-height;
   z-index: 100;
 
   &:not(:disabled):not(.disabled):not(.text-muted):hover::after {
@@ -186,6 +186,10 @@
     bottom: -1px;
     left: -1px;
   }
+
+  &:last-child {
+    margin-left: -1px;
+  }
 }
 
 .btn-group .btn {
diff --git a/web/html/src/branding/css/susemanager/index.scss b/web/html/src/branding/css/susemanager/index.scss
index 131b06177ef2..fb9907af3218 100644
--- a/web/html/src/branding/css/susemanager/index.scss
+++ b/web/html/src/branding/css/susemanager/index.scss
@@ -14,8 +14,8 @@
 
 @import "./components/titles.scss";
 @import "./components/alerts.scss";
-@import "./components/buttons.scss";
 @import "./components/inputs.scss";
+@import "./components/buttons.scss";
 @import "./components/modal.scss";
 @import "./components/nav.scss";
 @import "./components/panels.scss";
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index cb19f7e0655d..51330a579fea 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -12,6 +12,7 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/account/EditAddress.do",
   "/rhn/multiorg/OrgConfigDetails.do",
   "/rhn/manager/notification-messages",
+  "rhn/channels/software/Search.do",
 ];
 
 export const onEndNavigate = () => {