fix checkbox label in delete storage modal

cockpit-project · Aug 21, 2023 · 815230f · 815230f
1 parent 9f623cb
commit 815230f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/src/components/common/machinesConnectionSelector.jsx b/src/components/common/machinesConnectionSelector.jsx
@@ -37,7 +37,7 @@ export const MachinesConnectionSelector = ({ onValueChanged, loggedUser, connect
 
     return (
         <FormGroup label={_("Connection")}
-                   isInline hasNoPaddingTop
+                   isInline
                    id={id}
                    className="machines-connection-selector"
                    labelIcon={

diff --git a/src/components/storagePools/storagePoolDelete.jsx b/src/components/storagePools/storagePoolDelete.jsx
@@ -172,15 +172,14 @@ class StoragePoolDelete extends React.Component {
                     ? (volumes.length > 0
                         ? <Checkbox id='storage-pool-delete-volumes'
                                     isChecked={this.state.deleteVolumes}
-                                    label={<>
-                                        { _("Also delete all volumes inside this pool:")}
+                                    label={_("Also delete all volumes inside this pool:")}
+                                    body={
                                         <List className="pool-volumes-delete-list">
-                                            {volumes
-                                                    .sort((a, b) => a.name.localeCompare(b.name))
+                                            {volumes.sort((a, b) => a.name.localeCompare(b.name))
                                                     .map(vol => <ListItem key={storagePool.name + vol.name}>{vol.name}</ListItem>)
                                             }
                                         </List>
-                                    </>}
+                                    }
                                     onChange={(_event, checked) => this.onValueChanged('deleteVolumes', checked)} />
                         : _("No volumes exist in this storage pool."))
                     : _("Deleting an inactive storage pool will only undefine the pool. Its content will not be deleted.")

diff --git a/src/machines.scss b/src/machines.scss
@@ -102,10 +102,7 @@
   }
 }
 
-// radio buttons rendered vertically in pf-m-horizontal https://github.com/patternfly/patternfly/issues/5787
-.pf-v5-c-form__group-control.pf-m-inline {
-  .pf-v5-c-radio {
-    width: auto;
-    display: grid;
-  }
+// remove oversized gap between checkbox label and checkbox body
+#storage-pool-delete-modal span.pf-v5-c-check__body {
+    margin-top: 0;
 }
diff --git a/test/reference b/test/reference