Fix custom column classes in the updated theme

uyuni-project · Jul 29, 2024 · 6d84ddf · 6d84ddf
1 parent 07fee16
commit 6d84ddf
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 14 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
@@ -68,7 +68,10 @@ 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/kickstart/KickstartIpRanges.do",
+        "/rhn/channels/manage/repos/RepoCreate.do",
+        "/rhn/systems/details/Overview"
     );
 
     ViewHelper() { }

diff --git a/java/spacewalk-java.changes.eth.rows b/java/spacewalk-java.changes.eth.rows
@@ -0,0 +1 @@
+- Fix column alignment on repository and system pages
diff --git a/web/html/src/branding/css/base/fixes.scss b/web/html/src/branding/css/base/fixes.scss
@@ -27,19 +27,6 @@ div.checkbox.icon-wrapper i.fa {
   overflow: auto;
 }
 
-/**
- * This allows us to fix layouts on Bootstrap 5 pages without affecting Bootstrap 3 pages
- * TODO: Can we remove and replace its usages with just `row` after we finish the migration?
- */
-.form-group {
-  @extend .row;
-}
-
-// TODO: Remove this and squash it into just `row` after the migration is complete.
-.row-0 {
-  @extend .row;
-}
-
 // We use float utilities from Bootstrap 3 in a number of places, this emulates the same behavior. Over time we should be able to refactor these out.
 .pull-right {
   float: right !important;

diff --git a/web/html/src/branding/css/bootstrap5-grid-patch.scss b/web/html/src/branding/css/bootstrap5-grid-patch.scss
@@ -0,0 +1,15 @@
+@import "bootstrap5/scss/bootstrap-grid.scss";
+
+/**
+ * This allows us to fix layouts on Bootstrap 5 pages without affecting Bootstrap 3 pages.
+ * For now this reimplements the relevant part from web/html/src/node_modules/bootstrap5/scss/_grid.scss
+ * TODO: After we finish the migration, we should be able to remove these classes and just use `row` everywhere
+ */
+.form-group,
+.row-0 {
+  @include make-row();
+
+  > * {
+    @include make-col-ready();
+  }
+}
diff --git a/web/html/src/branding/css/susemanager-dark.scss b/web/html/src/branding/css/susemanager-dark.scss
@@ -6,6 +6,7 @@ $theme: "susemanager-dark";
 @import "./bootstrap5-scaffolding-variables.scss";
 
 .new-theme {
+  @import "./bootstrap5-grid-patch.scss";
   @import "bootstrap5/scss/bootstrap";
 
   @import "./mixins.scss";

diff --git a/web/html/src/branding/css/susemanager-light.scss b/web/html/src/branding/css/susemanager-light.scss
@@ -6,6 +6,7 @@ $theme: "susemanager-light";
 @import "./bootstrap5-scaffolding-variables.scss";
 
 .new-theme {
+  @import "./bootstrap5-grid-patch.scss";
   @import "bootstrap5/scss/bootstrap";
 
   @import "./mixins.scss";

diff --git a/web/html/src/branding/css/susemanager/components/help-block.scss b/web/html/src/branding/css/susemanager/components/help-block.scss
@@ -0,0 +1,8 @@
+// This module is provided by Bootstrap 3, hence it doesn't have a corresponding .less file
+.help-block {
+  display: block;
+  margin-top: 5px;
+  margin-bottom: 10px;
+  // TODO: After the migration is complete, replace this with a brand color, this color isn't used anywhere else right now
+  color: #425074;
+}
diff --git a/web/html/src/branding/css/susemanager/index.scss b/web/html/src/branding/css/susemanager/index.scss
@@ -27,6 +27,7 @@
 @import "./components/text.scss";
 @import "./components/address.scss";
 @import "./components/pre.scss";
+@import "./components/help-block.scss";
 
 @import "./bootstrap-fixes.scss";
 

diff --git a/web/html/src/branding/css/uyuni.scss b/web/html/src/branding/css/uyuni.scss
@@ -6,6 +6,7 @@ $theme: "uyuni";
 @import "./bootstrap5-scaffolding-variables.scss";
 
 .new-theme {
+  @import "./bootstrap5-grid-patch.scss";
   @import "bootstrap5/scss/bootstrap";
 
   @import "./mixins.scss";

diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
@@ -13,6 +13,9 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/multiorg/OrgConfigDetails.do",
   "/rhn/manager/notification-messages",
   "rhn/channels/software/Search.do",
+  "/rhn/kickstart/KickstartIpRanges.do",
+  "/rhn/channels/manage/repos/RepoCreate.do",
+  "/rhn/systems/details/Overview",
 ];
 
 export const onEndNavigate = () => {

diff --git a/web/spacewalk-web.changes.eth.rows b/web/spacewalk-web.changes.eth.rows
@@ -0,0 +1 @@
+- Fix column alignment on repository and system pages