From 285b0f9eb2d485b0aae4e048c737a66e6c6ed88d Mon Sep 17 00:00:00 2001 From: Richa Date: Tue, 11 Jun 2024 13:10:06 +0200 Subject: [PATCH 1/3] Fixed info button style in new theme --- .../susemanager/components/buttons.suma.scss | 17 +++++++++++++++++ .../susemanager/components/buttons.uyuni.scss | 12 ++++++++++++ 2 files changed, 29 insertions(+) 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 2e66a71d2c6b..15a7702aa121 100644 --- a/web/html/src/branding/css/susemanager/components/buttons.suma.scss +++ b/web/html/src/branding/css/susemanager/components/buttons.suma.scss @@ -149,6 +149,23 @@ } } +.btn-info { + &, + &:active, + &:focus, + &:disabled, + &.disabled { + &, + &:hover { + border-color: $eos-bc-cerulean-500; + + &:not(:disabled):not(.disabled):not(.text-muted):hover { + color: $white; + } + } + } +} + // Warning shouldn't currently be used anywhere, but cover it just in case .btn-warning, .btn-danger { diff --git a/web/html/src/branding/css/susemanager/components/buttons.uyuni.scss b/web/html/src/branding/css/susemanager/components/buttons.uyuni.scss index 853550875fc7..ba76aecead4a 100644 --- a/web/html/src/branding/css/susemanager/components/buttons.uyuni.scss +++ b/web/html/src/branding/css/susemanager/components/buttons.uyuni.scss @@ -60,3 +60,15 @@ border-color: #d43f3a; } } + +.btn-info { + color: #fff; + background-color: #5bc0de; + border-color: #46b8da; + + &:hover{ + color: #fff; + background-color: #31b0d5; + border-color: #269abc; + } +} From 3ae6e189db20c80fa6a9730b71dfd5684c66b74f Mon Sep 17 00:00:00 2001 From: Richa Date: Tue, 11 Jun 2024 13:35:27 +0200 Subject: [PATCH 2/3] Added change log --- java/code/src/com/suse/manager/webui/utils/ViewHelper.java | 6 +++++- web/html/src/core/spa/view-helper.ts | 4 ++++ ...k-web.changes.bisht-richa.fixed-btn-info-style-new-theme | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 web/spacewalk-web.changes.bisht-richa.fixed-btn-info-style-new-theme 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 4529d139f8ae..a985b9047e92 100644 --- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java +++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java @@ -78,7 +78,11 @@ public enum ViewHelper { "rhn/channels/software/Search.do", "/rhn/manager/systems/ssm/coco/settings", "/rhn/systems/ssm/audit/ScheduleXccdf.do", - "/rhn/systems/ssm/provisioning/PowerManagementConfiguration.do" + "/rhn/systems/ssm/provisioning/PowerManagementConfiguration.do", + "/rhn/systems/details/kickstart/PowerManagement.do", + "rhn/systems/ssm/provisioning/PowerManagementOperations.do", + "/rhn/channels/ChannelDetail.do", + "/rhn/software/packages/Details.do" ); ViewHelper() { } diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts index f93225622993..6675ad2116c6 100644 --- a/web/html/src/core/spa/view-helper.ts +++ b/web/html/src/core/spa/view-helper.ts @@ -22,6 +22,10 @@ const BOOTSTRAP_READY_PAGES: string[] = [ "/rhn/manager/systems/ssm/coco/settings", "/rhn/systems/ssm/audit/ScheduleXccdf.do", "/rhn/systems/ssm/provisioning/PowerManagementConfiguration.do", + "/rhn/systems/details/kickstart/PowerManagement.do", + "rhn/systems/ssm/provisioning/PowerManagementOperations.do", + "/rhn/channels/ChannelDetail.do", + "/rhn/software/packages/Details.do", ]; export const onEndNavigate = () => { diff --git a/web/spacewalk-web.changes.bisht-richa.fixed-btn-info-style-new-theme b/web/spacewalk-web.changes.bisht-richa.fixed-btn-info-style-new-theme new file mode 100644 index 000000000000..da498b6e9f7b --- /dev/null +++ b/web/spacewalk-web.changes.bisht-richa.fixed-btn-info-style-new-theme @@ -0,0 +1 @@ +- Fixed btn-info style in new theme From 46cb79712e54111eaaa653ef1d2399caffe1ff9c Mon Sep 17 00:00:00 2001 From: Richa Date: Thu, 13 Jun 2024 16:56:14 +0200 Subject: [PATCH 3/3] Fixed spcae error in ViewHelper.java --- java/code/src/com/suse/manager/webui/utils/ViewHelper.java | 2 +- web/html/src/core/spa/view-helper.ts | 2 +- 2 files changed, 2 insertions(+), 2 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 a985b9047e92..e9cb1cdc8db8 100644 --- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java +++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java @@ -80,7 +80,7 @@ public enum ViewHelper { "/rhn/systems/ssm/audit/ScheduleXccdf.do", "/rhn/systems/ssm/provisioning/PowerManagementConfiguration.do", "/rhn/systems/details/kickstart/PowerManagement.do", - "rhn/systems/ssm/provisioning/PowerManagementOperations.do", + "/rhn/systems/ssm/provisioning/PowerManagementOperations.do", "/rhn/channels/ChannelDetail.do", "/rhn/software/packages/Details.do" ); diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts index 6675ad2116c6..981bd83d462d 100644 --- a/web/html/src/core/spa/view-helper.ts +++ b/web/html/src/core/spa/view-helper.ts @@ -23,7 +23,7 @@ const BOOTSTRAP_READY_PAGES: string[] = [ "/rhn/systems/ssm/audit/ScheduleXccdf.do", "/rhn/systems/ssm/provisioning/PowerManagementConfiguration.do", "/rhn/systems/details/kickstart/PowerManagement.do", - "rhn/systems/ssm/provisioning/PowerManagementOperations.do", + "/rhn/systems/ssm/provisioning/PowerManagementOperations.do", "/rhn/channels/ChannelDetail.do", "/rhn/software/packages/Details.do", ];