From 1bf9725733142d0544220ed69174fede5b98b3c5 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Mon, 15 Apr 2024 19:12:51 +0200 Subject: [PATCH] change ActionIcons back to default --- .../src/components/buttons/ButtonMenu.tsx | 2 +- .../src/components/buttons/EditButton.tsx | 6 ++++- .../src/components/buttons/ScanButton.tsx | 1 + .../components/buttons/SpotlightButton.tsx | 6 ++++- .../src/components/details/Details.tsx | 6 ++++- .../src/components/forms/HostOptionsForm.tsx | 1 + .../src/components/items/ColorToggle.tsx | 1 + .../src/components/items/InvenTreeLogo.tsx | 2 +- .../src/components/items/LanguageToggle.tsx | 2 +- .../src/components/nav/BreadcrumbList.tsx | 2 +- src/frontend/src/components/nav/Header.tsx | 4 ++-- .../src/components/nav/NavHoverMenu.tsx | 1 + .../src/components/nav/NotificationDrawer.tsx | 1 + .../src/components/nav/PanelGroup.tsx | 1 + src/frontend/src/pages/Index/Scan.tsx | 24 +++++++++++++++---- src/frontend/src/tables/ColumnSelect.tsx | 2 +- src/frontend/src/tables/DownloadAction.tsx | 2 +- src/frontend/src/tables/InvenTreeTable.tsx | 4 ++-- .../src/tables/general/AttachmentTable.tsx | 2 ++ .../src/tables/part/ParametricPartTable.tsx | 2 +- 20 files changed, 54 insertions(+), 18 deletions(-) diff --git a/src/frontend/src/components/buttons/ButtonMenu.tsx b/src/frontend/src/components/buttons/ButtonMenu.tsx index 47192ad20f..42feeb0718 100644 --- a/src/frontend/src/components/buttons/ButtonMenu.tsx +++ b/src/frontend/src/components/buttons/ButtonMenu.tsx @@ -18,7 +18,7 @@ export function ButtonMenu({ return ( - + {icon} diff --git a/src/frontend/src/components/buttons/EditButton.tsx b/src/frontend/src/components/buttons/EditButton.tsx index 82a1cc02c2..a64aa41cc9 100644 --- a/src/frontend/src/components/buttons/EditButton.tsx +++ b/src/frontend/src/components/buttons/EditButton.tsx @@ -14,7 +14,11 @@ export function EditButton({ }) { saveIcon = saveIcon || ; return ( - setEditing()} disabled={disabled}> + setEditing()} + disabled={disabled} + variant="default" + > {editing ? saveIcon : } ); diff --git a/src/frontend/src/components/buttons/ScanButton.tsx b/src/frontend/src/components/buttons/ScanButton.tsx index c3fe6d14b5..8f4f58eb63 100644 --- a/src/frontend/src/components/buttons/ScanButton.tsx +++ b/src/frontend/src/components/buttons/ScanButton.tsx @@ -16,6 +16,7 @@ export function ScanButton() { innerProps: {} }) } + variant="default" > diff --git a/src/frontend/src/components/buttons/SpotlightButton.tsx b/src/frontend/src/components/buttons/SpotlightButton.tsx index a9bc336482..39fd18c723 100644 --- a/src/frontend/src/components/buttons/SpotlightButton.tsx +++ b/src/frontend/src/components/buttons/SpotlightButton.tsx @@ -9,7 +9,11 @@ import { firstSpotlight } from '../nav/Layout'; */ export function SpotlightButton() { return ( - firstSpotlight.open()} title={t`Open spotlight`}> + firstSpotlight.open()} + title={t`Open spotlight`} + variant="default" + > ); diff --git a/src/frontend/src/components/details/Details.tsx b/src/frontend/src/components/details/Details.tsx index d291d5d8e2..388f8d7870 100644 --- a/src/frontend/src/components/details/Details.tsx +++ b/src/frontend/src/components/details/Details.tsx @@ -325,7 +325,11 @@ function CopyField({ value }: { value: string }) { {({ copied, copy }) => ( - + {copied ? ( ) : ( diff --git a/src/frontend/src/components/forms/HostOptionsForm.tsx b/src/frontend/src/components/forms/HostOptionsForm.tsx index d8f5efdec8..15f8368256 100644 --- a/src/frontend/src/components/forms/HostOptionsForm.tsx +++ b/src/frontend/src/components/forms/HostOptionsForm.tsx @@ -49,6 +49,7 @@ export function HostOptionsForm({ onClick={() => { deleteItem(key); }} + variant="default" > diff --git a/src/frontend/src/components/items/ColorToggle.tsx b/src/frontend/src/components/items/ColorToggle.tsx index 1893a82362..b9afd8c461 100644 --- a/src/frontend/src/components/items/ColorToggle.tsx +++ b/src/frontend/src/components/items/ColorToggle.tsx @@ -15,6 +15,7 @@ export function ColorToggle() { color: colorScheme === 'dark' ? vars.colors.yellow[4] : vars.colors.blue[6] }} + variant="default" > {colorScheme === 'dark' ? : } diff --git a/src/frontend/src/components/items/InvenTreeLogo.tsx b/src/frontend/src/components/items/InvenTreeLogo.tsx index 811658bfa6..b0a92c3c65 100644 --- a/src/frontend/src/components/items/InvenTreeLogo.tsx +++ b/src/frontend/src/components/items/InvenTreeLogo.tsx @@ -10,7 +10,7 @@ export const InvenTreeLogoHomeButton = forwardRef( return (
- + diff --git a/src/frontend/src/components/items/LanguageToggle.tsx b/src/frontend/src/components/items/LanguageToggle.tsx index c228dc6cb8..73dc9d50c9 100644 --- a/src/frontend/src/components/items/LanguageToggle.tsx +++ b/src/frontend/src/components/items/LanguageToggle.tsx @@ -16,7 +16,7 @@ export function LanguageToggle() { padding: open === true ? 8 : 0 }} > - toggle.toggle()} size="lg"> + toggle.toggle()} size="lg" variant="default"> {open && ( diff --git a/src/frontend/src/components/nav/BreadcrumbList.tsx b/src/frontend/src/components/nav/BreadcrumbList.tsx index 170c9e40ca..ec7ffdf789 100644 --- a/src/frontend/src/components/nav/BreadcrumbList.tsx +++ b/src/frontend/src/components/nav/BreadcrumbList.tsx @@ -44,7 +44,7 @@ export function BreadcrumbList({ {navCallback && ( - + )} diff --git a/src/frontend/src/components/nav/Header.tsx b/src/frontend/src/components/nav/Header.tsx index 5e43603f4b..4be29caa47 100644 --- a/src/frontend/src/components/nav/Header.tsx +++ b/src/frontend/src/components/nav/Header.tsx @@ -94,12 +94,12 @@ export function Header() { - + - + diff --git a/src/frontend/src/components/nav/NotificationDrawer.tsx b/src/frontend/src/components/nav/NotificationDrawer.tsx index 471d2c908e..a64745df16 100644 --- a/src/frontend/src/components/nav/NotificationDrawer.tsx +++ b/src/frontend/src/components/nav/NotificationDrawer.tsx @@ -73,6 +73,7 @@ export function NotificationDrawer({ onClose(); navigate('/notifications/unread'); }} + variant="default" > diff --git a/src/frontend/src/components/nav/PanelGroup.tsx b/src/frontend/src/components/nav/PanelGroup.tsx index f8f1585fc1..33f6cf547f 100644 --- a/src/frontend/src/components/nav/PanelGroup.tsx +++ b/src/frontend/src/components/nav/PanelGroup.tsx @@ -140,6 +140,7 @@ function BasePanelGroup({ paddingLeft: '10px' }} onClick={() => setExpanded(!expanded)} + variant="default" > {expanded ? ( diff --git a/src/frontend/src/pages/Index/Scan.tsx b/src/frontend/src/pages/Index/Scan.tsx index 9a20100bf7..06c0cfde17 100644 --- a/src/frontend/src/pages/Index/Scan.tsx +++ b/src/frontend/src/pages/Index/Scan.tsx @@ -258,7 +258,11 @@ export default function Scan() { Actions for {uniqueObjectTypes[0]} - + @@ -329,6 +333,7 @@ export default function Scan() { color="red" onClick={btnDeleteHistory} title={t`Delete`} + variant="default" > @@ -336,6 +341,7 @@ export default function Scan() { onClick={btnRunSelectedBarcode} disabled={selection.length > 1} title={t`Lookup part`} + variant="default" > @@ -343,6 +349,7 @@ export default function Scan() { onClick={btnOpenSelectedLink} disabled={!selectionLinked} title={t`Open Link`} + variant="default" > @@ -362,7 +369,11 @@ export default function Scan() { > History - + @@ -509,7 +520,7 @@ function InputManual({ action }: inputProps) { onChange={(event) => setValue(event.currentTarget.value)} onKeyDown={getHotkeyHandler([['Enter', btnAddItem]])} /> - + @@ -704,7 +715,11 @@ function InputImageBarcode({ action }: inputProps) { size="sm" /> {ScanningEnabled ? ( - + ) : ( @@ -712,6 +727,7 @@ function InputImageBarcode({ action }: inputProps) { onClick={btnStartScanning} title={t`Start scanning`} disabled={!camId} + variant="default" > diff --git a/src/frontend/src/tables/ColumnSelect.tsx b/src/frontend/src/tables/ColumnSelect.tsx index 4cf66fe58f..8ce5fb38a3 100644 --- a/src/frontend/src/tables/ColumnSelect.tsx +++ b/src/frontend/src/tables/ColumnSelect.tsx @@ -13,7 +13,7 @@ export function TableColumnSelect({ return ( - + diff --git a/src/frontend/src/tables/DownloadAction.tsx b/src/frontend/src/tables/DownloadAction.tsx index daed196ede..91ce561c41 100644 --- a/src/frontend/src/tables/DownloadAction.tsx +++ b/src/frontend/src/tables/DownloadAction.tsx @@ -18,7 +18,7 @@ export function DownloadAction({ <> - + diff --git a/src/frontend/src/tables/InvenTreeTable.tsx b/src/frontend/src/tables/InvenTreeTable.tsx index 8939ccec4c..f46c45fd2b 100644 --- a/src/frontend/src/tables/InvenTreeTable.tsx +++ b/src/frontend/src/tables/InvenTreeTable.tsx @@ -592,7 +592,7 @@ export function InvenTreeTable({ /> )} {tableProps.enableRefresh && ( - + refetch()} /> @@ -610,7 +610,7 @@ export function InvenTreeTable({ label={tableState.activeFilters?.length ?? 0} disabled={tableState.activeFilters?.length == 0} > - + setFiltersVisible(!filtersVisible)} diff --git a/src/frontend/src/tables/general/AttachmentTable.tsx b/src/frontend/src/tables/general/AttachmentTable.tsx index 2330d31898..0d9405cb95 100644 --- a/src/frontend/src/tables/general/AttachmentTable.tsx +++ b/src/frontend/src/tables/general/AttachmentTable.tsx @@ -196,6 +196,7 @@ export function AttachmentTable({ attachmentType: 'file', callback: table.refreshTable }); + variant = 'default'; }} > @@ -215,6 +216,7 @@ export function AttachmentTable({ attachmentType: 'link', callback: table.refreshTable }); + variant = 'default'; }} > diff --git a/src/frontend/src/tables/part/ParametricPartTable.tsx b/src/frontend/src/tables/part/ParametricPartTable.tsx index 51ea698b39..3477bdbe73 100644 --- a/src/frontend/src/tables/part/ParametricPartTable.tsx +++ b/src/frontend/src/tables/part/ParametricPartTable.tsx @@ -78,7 +78,7 @@ function ParameterCell({ {hovered && canEdit && (
- +