From 8f1390c1853ed6224bb8705ccc0d982962d8bd67 Mon Sep 17 00:00:00 2001 From: Etheryte Date: Mon, 29 Jul 2024 13:17:27 +0300 Subject: [PATCH] Fix alert layout in formula catalog in the updated theme --- java/code/src/com/suse/manager/webui/utils/ViewHelper.java | 3 ++- web/html/src/branding/css/susemanager/components/alerts.scss | 4 ++++ web/html/src/core/spa/view-helper.ts | 1 + web/spacewalk-web.changes.eth.alert-margin | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 web/spacewalk-web.changes.eth.alert-margin 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 b801d7c5ce53..97d7bdd01a23 100644 --- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java +++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java @@ -68,7 +68,8 @@ public enum ViewHelper { "/rhn/account/EditAddress.do", "/rhn/multiorg/OrgConfigDetails.do", "/rhn/manager/notification-messages", - "rhn/channels/software/Search.do" + "rhn/channels/software/Search.do", + "/rhn/manager/formula-catalog" ); ViewHelper() { } diff --git a/web/html/src/branding/css/susemanager/components/alerts.scss b/web/html/src/branding/css/susemanager/components/alerts.scss index 6c8c42151978..5ac6f5952994 100644 --- a/web/html/src/branding/css/susemanager/components/alerts.scss +++ b/web/html/src/branding/css/susemanager/components/alerts.scss @@ -18,6 +18,10 @@ ul { padding-left: 15px; } + + > p { + margin: 0; + } } .alert:after, diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts index 51330a579fea..e7b43883aae9 100644 --- a/web/html/src/core/spa/view-helper.ts +++ b/web/html/src/core/spa/view-helper.ts @@ -13,6 +13,7 @@ const BOOTSTRAP_READY_PAGES: string[] = [ "/rhn/multiorg/OrgConfigDetails.do", "/rhn/manager/notification-messages", "rhn/channels/software/Search.do", + "/rhn/manager/formula-catalog", ]; export const onEndNavigate = () => { diff --git a/web/spacewalk-web.changes.eth.alert-margin b/web/spacewalk-web.changes.eth.alert-margin new file mode 100644 index 000000000000..c1e6e03cd00a --- /dev/null +++ b/web/spacewalk-web.changes.eth.alert-margin @@ -0,0 +1 @@ +- Fix alert layout in formula catalog