Merge pull request #13473 from rhamilto/OCPBUGS-25780

OCPBUGS-25780: fix bug where Update cluster modal will not open
openshift · Jan 4, 2024 · 8297907 · 8297907
2 parents fcef86c + 7958d33
commit 8297907
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.../console-shared/src/components/dropdown/dropdown-with-switch/DropdownWithSwitchToggle.tsx b/.../console-shared/src/components/dropdown/dropdown-with-switch/DropdownWithSwitchToggle.tsx
@@ -47,7 +47,7 @@ const DropdownWithSwitchToggle: React.FC<DropdownWithSwitchToggleProps> = ({
         direction="down"
         enableFlip={false}
         isVisible={isOpen}
-        popper={menu}
+        popper={<>{menu}</>} // fragment is necessary to avoid a bug in PatternFly v5 Popper
         position="left"
         trigger={
           <MenuToggle

diff --git a/frontend/public/style/_common.scss b/frontend/public/style/_common.scss
@@ -165,11 +165,15 @@ dl.co-inline {
   margin: 15px 0;
 }
 
-// TODO: remove when $font-size-base goes away or to 16px
-// and when override `label` font-weight style from _bootstrap-residual.scss is removed
-.co-switch-label .pf-v5-c-switch__label {
-  font-size: $font-size-base;
-  font-weight: var(--pf-v5-global--FontWeight--normal);
+.co-switch-label {
+  margin-bottom: 0;
+
+  // TODO: remove when $font-size-base goes away or to 16px
+  // and when override `label` font-weight style from _bootstrap-residual.scss is removed
+  .pf-v5-c-switch__label {
+    font-size: $font-size-base;
+    font-weight: var(--pf-v5-global--FontWeight--normal);
+  }
 }
 
 .co-table-container {