Skip to content

Commit 4970fb9

Browse files
chore: replace MUI icons - 4 (#17748)
1. Replaced CloudUploadOutlined with CloudUploadIcon in FileUpload.tsx 2. Replaced DeleteOutline with TrashIcon in: - WorkspaceTopbar.tsx - TokensPageView.tsx - GroupPage.tsx 3. Replaced FolderOutlined with FolderIcon in FileUpload.tsx
1 parent aa4b764 commit 4970fb9

File tree

5 files changed

+16
-18
lines changed

5 files changed

+16
-18
lines changed

site/src/components/FileUpload/FileUpload.tsx

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import { type Interpolation, type Theme, css } from "@emotion/react";
2-
import UploadIcon from "@mui/icons-material/CloudUploadOutlined";
3-
import RemoveIcon from "@mui/icons-material/DeleteOutline";
4-
import FileIcon from "@mui/icons-material/FolderOutlined";
52
import CircularProgress from "@mui/material/CircularProgress";
63
import IconButton from "@mui/material/IconButton";
74
import { Stack } from "components/Stack/Stack";
85
import { useClickable } from "hooks/useClickable";
6+
import { CloudUploadIcon, FolderIcon, TrashIcon } from "lucide-react";
97
import { type DragEvent, type FC, type ReactNode, useRef } from "react";
108

119
export interface FileUploadProps {
@@ -44,12 +42,12 @@ export const FileUpload: FC<FileUploadProps> = ({
4442
alignItems="center"
4543
>
4644
<Stack direction="row" alignItems="center">
47-
<FileIcon />
45+
<FolderIcon className="size-icon-sm" />
4846
<span>{file.name}</span>
4947
</Stack>
5048

5149
<IconButton title={removeLabel} size="small" onClick={onRemove}>
52-
<RemoveIcon />
50+
<TrashIcon className="size-icon-sm" />
5351
</IconButton>
5452
</Stack>
5553
);
@@ -68,7 +66,7 @@ export const FileUpload: FC<FileUploadProps> = ({
6866
{isUploading ? (
6967
<CircularProgress size={32} />
7068
) : (
71-
<UploadIcon css={styles.icon} />
69+
<CloudUploadIcon className="size-16" />
7270
)}
7371
</div>
7472

@@ -166,10 +164,6 @@ const styles = {
166164
justifyContent: "center",
167165
},
168166

169-
icon: {
170-
fontSize: 64,
171-
},
172-
173167
title: {
174168
fontSize: 16,
175169
lineHeight: "1",

site/src/components/FullPageLayout/Topbar.tsx

+6-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
cloneElement,
1212
forwardRef,
1313
} from "react";
14+
import { cn } from "utils/cn";
1415

1516
export const Topbar: FC<HTMLAttributes<HTMLElement>> = (props) => {
1617
const theme = useTheme();
@@ -89,7 +90,7 @@ type TopbarIconProps = HTMLAttributes<HTMLOrSVGElement>;
8990

9091
export const TopbarIcon = forwardRef<HTMLOrSVGElement, TopbarIconProps>(
9192
(props: TopbarIconProps, ref) => {
92-
const { children, ...restProps } = props;
93+
const { children, className, ...restProps } = props;
9394
const theme = useTheme();
9495

9596
return cloneElement(
@@ -101,7 +102,10 @@ export const TopbarIcon = forwardRef<HTMLOrSVGElement, TopbarIconProps>(
101102
{
102103
...restProps,
103104
ref,
104-
className: css({ fontSize: 16, color: theme.palette.text.disabled }),
105+
className: cn([
106+
css({ fontSize: 16, color: theme.palette.text.disabled }),
107+
"size-icon-sm",
108+
]),
105109
},
106110
);
107111
},

site/src/pages/GroupsPage/GroupPage.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import type { Interpolation, Theme } from "@emotion/react";
2-
import DeleteOutline from "@mui/icons-material/DeleteOutline";
32
import PersonAdd from "@mui/icons-material/PersonAdd";
43
import SettingsOutlined from "@mui/icons-material/SettingsOutlined";
54
import LoadingButton from "@mui/lab/LoadingButton";
@@ -51,6 +50,7 @@ import {
5150
TableToolbar,
5251
} from "components/TableToolbar/TableToolbar";
5352
import { MemberAutocomplete } from "components/UserAutocomplete/UserAutocomplete";
53+
import { TrashIcon } from "lucide-react";
5454
import { EllipsisVertical } from "lucide-react";
5555
import { type FC, useState } from "react";
5656
import { Helmet } from "react-helmet-async";
@@ -134,7 +134,7 @@ const GroupPage: FC = () => {
134134
onClick={() => {
135135
setIsDeletingGroup(true);
136136
}}
137-
startIcon={<DeleteOutline />}
137+
startIcon={<TrashIcon className="size-icon-sm" />}
138138
css={styles.removeButton}
139139
>
140140
Delete&hellip;

site/src/pages/UserSettingsPage/TokensPage/TokensPageView.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { useTheme } from "@emotion/react";
2-
import DeleteOutlineIcon from "@mui/icons-material/DeleteOutline";
32
import IconButton from "@mui/material/IconButton";
43
import Table from "@mui/material/Table";
54
import TableBody from "@mui/material/TableBody";
@@ -15,6 +14,7 @@ import { TableEmpty } from "components/TableEmpty/TableEmpty";
1514
import { TableLoader } from "components/TableLoader/TableLoader";
1615
import dayjs from "dayjs";
1716
import relativeTime from "dayjs/plugin/relativeTime";
17+
import { TrashIcon } from "lucide-react";
1818
import type { FC, ReactNode } from "react";
1919

2020
dayjs.extend(relativeTime);
@@ -115,7 +115,7 @@ export const TokensPageView: FC<TokensPageViewProps> = ({
115115
size="medium"
116116
aria-label="Delete token"
117117
>
118-
<DeleteOutlineIcon />
118+
<TrashIcon className="size-icon-sm" />
119119
</IconButton>
120120
</span>
121121
</TableCell>

site/src/pages/WorkspacePage/WorkspaceTopbar.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { type Interpolation, type Theme, useTheme } from "@emotion/react";
22
import ArrowBackOutlined from "@mui/icons-material/ArrowBackOutlined";
3-
import DeleteOutline from "@mui/icons-material/DeleteOutline";
43
import QuotaIcon from "@mui/icons-material/MonetizationOnOutlined";
54
import Link from "@mui/material/Link";
65
import Tooltip from "@mui/material/Tooltip";
@@ -18,6 +17,7 @@ import {
1817
} from "components/FullPageLayout/Topbar";
1918
import { HelpTooltipContent } from "components/HelpTooltip/HelpTooltip";
2019
import { Popover, PopoverTrigger } from "components/deprecated/Popover/Popover";
20+
import { TrashIcon } from "lucide-react";
2121
import { useDashboard } from "modules/dashboard/useDashboard";
2222
import { linkToTemplate, useLinks } from "modules/navigation";
2323
import { WorkspaceStatusBadge } from "modules/workspaces/WorkspaceStatusBadge/WorkspaceStatusBadge";
@@ -199,7 +199,7 @@ export const WorkspaceTopbar: FC<WorkspaceProps> = ({
199199
{shouldDisplayDormantData && (
200200
<TopbarData>
201201
<TopbarIcon>
202-
<DeleteOutline />
202+
<TrashIcon />
203203
</TopbarIcon>
204204
<Link
205205
component={RouterLink}

0 commit comments

Comments
 (0)