storage: remove some unnecessary occurances of pull-right class

pull-right class should not be used - see cockpit-project#14544
marusak · Oct 21, 2020 · f12c0c8 · f12c0c8
1 parent 27381f0
commit f12c0c8
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 36 deletions.
diff --git a/pkg/storaged/content-views.jsx b/pkg/storaged/content-views.jsx
@@ -628,11 +628,10 @@ const BlockContent = ({ client, block, allow_partitions }) => {
     var format_disk_btn = null;
     if (allow_partitions)
         format_disk_btn = (
-            <div className="pull-right">
-                <StorageButton onClick={format_disk} excuse={block.ReadOnly ? _("Device is read-only") : null}>
-                    {_("Create partition table")}
-                </StorageButton>
-            </div>);
+            <StorageButton onClick={format_disk} excuse={block.ReadOnly ? _("Device is read-only") : null}>
+                {_("Create partition table")}
+            </StorageButton>
+        );
 
     return (
         <Card>
@@ -796,14 +795,13 @@ export class VGroup extends React.Component {
         var excuse = vgroup.FreeSize == 0 && _("No free space");
 
         var new_volume_link = (
-            <div className="pull-right">
-                <StorageLink onClick={create_logical_volume}
-                             excuse={excuse}>
-                    <span className="pficon pficon-add-circle-o" />
-                    {" "}
-                    {_("Create new logical volume")}
-                </StorageLink>
-            </div>);
+            <StorageLink onClick={create_logical_volume}
+                         excuse={excuse}>
+                <span className="pficon pficon-add-circle-o" />
+                {" "}
+                {_("Create new logical volume")}
+            </StorageLink>
+        );
 
         return (
             <Card>

diff --git a/pkg/storaged/nfs-details.jsx b/pkg/storaged/nfs-details.jsx
@@ -21,7 +21,9 @@ import cockpit from "cockpit";
 import React from "react";
 import moment from "moment";
 import {
-    Alert, Card, CardTitle, CardBody, Text, TextVariants,
+    Alert,
+    Card, CardHeader, CardTitle, CardBody, CardActions,
+    Text, TextVariants,
     DescriptionList,
     DescriptionListTerm,
     DescriptionListGroup,
@@ -297,23 +299,27 @@ export class NFSDetails extends React.Component {
 
         var header = (
             <Card>
-                <CardTitle>
-                    <Text component={TextVariants.h2}>{entry.fields[0]}</Text>
-                    <span className="pull-right">
-                        { entry.mounted
-                            ? <StorageButton onClick={unmount}>{_("Unmount")}</StorageButton>
-                            : <StorageButton onClick={mount}>{_("Mount")}</StorageButton>
-                        }
-                        { "\n" }
-                        { entry.fstab
-                            ? [
-                                <StorageButton key="1" onClick={edit}>{_("Edit")}</StorageButton>,
-                                "\n",
-                                <StorageButton key="2" onClick={remove} kind="danger">{_("Remove")}</StorageButton>
-                            ] : null
-                        }
-                    </span>
-                </CardTitle>
+                <CardHeader>
+                    <CardTitle>
+                        <Text component={TextVariants.h2}>{entry.fields[0]}</Text>
+                    </CardTitle>
+                    <CardActions>
+                        <>
+                            { entry.mounted
+                                ? <StorageButton onClick={unmount}>{_("Unmount")}</StorageButton>
+                                : <StorageButton onClick={mount}>{_("Mount")}</StorageButton>
+                            }
+                            { "\n" }
+                            { entry.fstab
+                                ? [
+                                    <StorageButton key="1" onClick={edit}>{_("Edit")}</StorageButton>,
+                                    "\n",
+                                    <StorageButton key="2" onClick={remove} kind="danger">{_("Remove")}</StorageButton>
+                                ] : null
+                            }
+                        </>
+                    </CardActions>
+                </CardHeader>
                 <CardBody>
                     <DescriptionList isHorizontal>
                         <DescriptionListGroup>

diff --git a/pkg/storaged/storage.scss b/pkg/storaged/storage.scss
@@ -449,11 +449,6 @@ a.disabled {
     margin-left: 2em;
 }
 
-.listing-ct caption .pull-right {
-    margin-right: 10px;
-}
-
-
 /* Make tooltips inside tables visible.
  */