From 4a4ac08cb8cee416f961a20245fbd5a893bbf8f9 Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Thu, 30 Nov 2023 10:59:17 +0200 Subject: [PATCH] WIP - GNOME icons Alignment seems off --- pkg/storaged/drive/drive.jsx | 8 ++++---- pkg/storaged/iscsi/session.jsx | 2 +- pkg/storaged/lvm2/volume-group.jsx | 2 +- pkg/storaged/mdraid/mdraid.jsx | 2 +- pkg/storaged/nfs/nfs.jsx | 2 +- pkg/storaged/storage.scss | 4 ++-- pkg/storaged/stratis/pool.jsx | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkg/storaged/drive/drive.jsx b/pkg/storaged/drive/drive.jsx index 023f8458ebf2..60320fb15b7f 100644 --- a/pkg/storaged/drive/drive.jsx +++ b/pkg/storaged/drive/drive.jsx @@ -24,8 +24,8 @@ import client from "../client"; import { CardBody } from "@patternfly/react-core/dist/esm/components/Card/index.js"; import { DescriptionList } from "@patternfly/react-core/dist/esm/components/DescriptionList/index.js"; import { Flex } from "@patternfly/react-core/dist/esm/layouts/Flex/index.js"; -import { OutlinedHddIcon, MicrochipIcon, SaveIcon } from "@patternfly/react-icons"; +import { HDDIcon, SSDIcon, MediaDriveIcon } from "../icons/gnome-icons.jsx"; import { StorageCard, StorageDescription, new_card, new_page } from "../pages.jsx"; import { block_name, drive_name, format_temperature, fmt_size_long } from "../utils.js"; import { make_block_page } from "../block/create-pages.jsx"; @@ -63,9 +63,9 @@ export function make_drive_page(parent, drive) { }; const drive_icon = { - media: SaveIcon, - ssd: MicrochipIcon, - hdd: OutlinedHddIcon, + media: MediaDriveIcon, + ssd: SSDIcon, + hdd: HDDIcon, }; const drive_card = new_card({ diff --git a/pkg/storaged/iscsi/session.jsx b/pkg/storaged/iscsi/session.jsx index 7aaa0bafd319..eae276ec173f 100644 --- a/pkg/storaged/iscsi/session.jsx +++ b/pkg/storaged/iscsi/session.jsx @@ -23,8 +23,8 @@ import client from "../client"; import { CardBody } from "@patternfly/react-core/dist/esm/components/Card/index.js"; import { DescriptionList } from "@patternfly/react-core/dist/esm/components/DescriptionList/index.js"; -import { NetworkIcon } from "@patternfly/react-icons"; +import { NetworkIcon } from "../icons/gnome-icons.jsx"; import { StorageDescription, new_page, new_card, ChildrenTable, StorageCard } from "../pages.jsx"; import { make_drive_page } from "../drive/drive.jsx"; diff --git a/pkg/storaged/lvm2/volume-group.jsx b/pkg/storaged/lvm2/volume-group.jsx index 0017a4595b97..4a5932932783 100644 --- a/pkg/storaged/lvm2/volume-group.jsx +++ b/pkg/storaged/lvm2/volume-group.jsx @@ -24,10 +24,10 @@ import client from "../client"; import { Alert } from "@patternfly/react-core/dist/esm/components/Alert/index.js"; import { CardHeader, CardBody } from "@patternfly/react-core/dist/esm/components/Card/index.js"; import { DescriptionList } from "@patternfly/react-core/dist/esm/components/DescriptionList/index.js"; -import { VolumeIcon } from "@patternfly/react-icons"; import { useObject } from "hooks"; +import { VolumeIcon } from "../icons/gnome-icons.jsx"; import { StorageButton, StorageLink } from "../storage-controls.jsx"; import { StorageCard, StorageDescription, ChildrenTable, PageTable, new_page, new_card, get_crossrefs, diff --git a/pkg/storaged/mdraid/mdraid.jsx b/pkg/storaged/mdraid/mdraid.jsx index 0a0153dc4169..6b09e2b9a44e 100644 --- a/pkg/storaged/mdraid/mdraid.jsx +++ b/pkg/storaged/mdraid/mdraid.jsx @@ -24,8 +24,8 @@ import client from "../client"; import { Alert } from "@patternfly/react-core/dist/esm/components/Alert/index.js"; import { CardHeader, CardBody } from "@patternfly/react-core/dist/esm/components/Card/index.js"; import { DescriptionList } from "@patternfly/react-core/dist/esm/components/DescriptionList/index.js"; -import { VolumeIcon } from "@patternfly/react-icons"; +import { VolumeIcon } from "../icons/gnome-icons.jsx"; import { StorageButton, StorageLink } from "../storage-controls.jsx"; import { StorageCard, StorageDescription, PageTable, new_page, new_card, get_crossrefs, navigate_away_from_card } from "../pages.jsx"; import { make_block_page } from "../block/create-pages.jsx"; diff --git a/pkg/storaged/nfs/nfs.jsx b/pkg/storaged/nfs/nfs.jsx index 6726466734c3..f5552f5c8a6f 100644 --- a/pkg/storaged/nfs/nfs.jsx +++ b/pkg/storaged/nfs/nfs.jsx @@ -24,8 +24,8 @@ import client from "../client"; import { Alert } from "@patternfly/react-core/dist/esm/components/Alert/index.js"; import { CardBody } from "@patternfly/react-core/dist/esm/components/Card/index.js"; import { DescriptionList } from "@patternfly/react-core/dist/esm/components/DescriptionList/index.js"; -import { NetworkIcon } from "@patternfly/react-icons"; +import { NetworkIcon } from "../icons/gnome-icons.jsx"; import { dialog_open, TextInput, ComboBox, CheckBoxes, StopProcessesMessage, stop_processes_danger_message diff --git a/pkg/storaged/storage.scss b/pkg/storaged/storage.scss index ad74cf8b274a..e6423d14da17 100644 --- a/pkg/storaged/storage.scss +++ b/pkg/storaged/storage.scss @@ -61,12 +61,12 @@ padding-block: 0.75em; padding-inline: 0; } - + td, th { &:first-child { padding-inline-start: 0.75em; } - + &:last-child { padding-inline-end: 0.75em; } diff --git a/pkg/storaged/stratis/pool.jsx b/pkg/storaged/stratis/pool.jsx index 5c5f3be28943..5ca95fc1f811 100644 --- a/pkg/storaged/stratis/pool.jsx +++ b/pkg/storaged/stratis/pool.jsx @@ -26,8 +26,8 @@ import { Alert } from "@patternfly/react-core/dist/esm/components/Alert/index.js import { CardHeader, CardBody } from "@patternfly/react-core/dist/esm/components/Card/index.js"; import { DescriptionList } from "@patternfly/react-core/dist/esm/components/DescriptionList/index.js"; import { Flex, FlexItem } from "@patternfly/react-core/dist/esm/layouts/Flex/index.js"; -import { VolumeIcon } from "@patternfly/react-icons"; +import { VolumeIcon } from "../icons/gnome-icons.jsx"; import { fmt_to_fragments } from "utils.jsx"; import { StorageButton, StorageUsageBar, StorageLink } from "../storage-controls.jsx";