Skip to content

Commit

Permalink
Update icons
Browse files Browse the repository at this point in the history
  • Loading branch information
spaaaacccee committed Nov 21, 2024
1 parent f98d846 commit 2b81e73
Show file tree
Hide file tree
Showing 40 changed files with 388 additions and 360 deletions.
Binary file modified bun.lockb
Binary file not shown.
2 changes: 2 additions & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
"@emotion/styled": "^11.13.5",
"@hello-pangea/dnd": "^17.0.0",
"@monaco-editor/react": "^4.6.0",
"@mui-symbols-material/w300": "^0.3.3",
"@mui-symbols-material/w400": "^0.3.3",
"@mui/icons-material": "^6.1.8",
"@mui/lab": "^6.0.0-beta.16",
"@mui/material": "^6.1.8",
Expand Down
4 changes: 2 additions & 2 deletions client/src/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,12 @@ export function Sidebar({ children }: { children?: ReactNode }) {
alignItems: "center",
display: "flex",
"> svg > path": {
strokeWidth: 0.5,
strokeWidth: 1,
stroke: bgcolor,
},
}}
>
{c.icon}
{c.iconThin ?? c.icon}
</Box>
</Tooltip>
}
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/app-bar/FeaturePickerButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { KeyboardArrowDownOutlined } from "@mui/icons-material";
import { KeyboardArrowDownOutlined } from "@mui-symbols-material/w400";
import { Box, Button, ButtonProps } from "@mui/material";
import { Props } from "./FeaturePicker";

Expand Down
2 changes: 1 addition & 1 deletion client/src/components/app-bar/Input.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FileOpenOutlined } from "@mui/icons-material";
import { FileOpenOutlined } from "@mui-symbols-material/w400";
import { useSnackbar } from "components/generic/Snackbar";
import { find, get, startCase } from "lodash";
import { Map, UploadedTrace } from "slices/UIState";
Expand Down
216 changes: 109 additions & 107 deletions client/src/components/app-bar/Playback.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
ChevronLeftOutlined as PreviousIcon,
SkipNextOutlined as SkipIcon,
SkipPreviousOutlined as StopIcon,
} from "@mui/icons-material";
} from "@mui-symbols-material/w300";
import {
Button,
Collapse,
Expand Down Expand Up @@ -98,113 +98,115 @@ export function Playback({ layer }: { layer?: Layer<PlaybackLayerData> }) {
const [stepInput, setStepInput] = useState("");
const parsedStepInput = parseInt(stepInput);
const parsedStepInputValid = !isNaN(parsedStepInput);
return (<>
<IconButton
label="previous-breakpoint"
icon={<StopIcon />}
onClick={() => {
stepTo(findBreakpoint(-1));
}}
disabled={!canStop || !canStepBackward}
/>
<IconButton
label="step-backward"
icon={<PreviousIcon />}
onClick={stepBackward}
disabled={!canStepBackward}
/>
<IconButton
{...(playing
? {
label: "pause",
icon: <PauseIcon />,
onClick: () => pause(),
disabled: !canPause,
}
: {
label: "play",
icon: <PlayIcon />,
onClick: () => play(),
disabled: !canPlay,
color: "primary",
})}
/>
<IconButton
label="step-forward"
icon={<NextIcon />}
onClick={stepForward}
disabled={!canStepForward}
/>
<IconButton
label="next-breakpoint"
icon={<SkipIcon />}
onClick={() => {
stepTo(findBreakpoint());
}}
disabled={!canStepForward}
/>
{divider}
<PopupState variant="popover">
{(state) => (
<>
<Button sx={{ minWidth: 0 }} {...bindTrigger(state)}>
<Typography
component="div"
variant="body2"
color="text.secondary"
sx={{
px: 0.25,
py: 0.25,
textAlign: "center",
...paper(0),
borderRadius: 1,
}}
return (
<>
<IconButton
label="previous-breakpoint"
icon={<StopIcon />}
onClick={() => {
stepTo(findBreakpoint(-1));
}}
disabled={!canStop || !canStepBackward}
/>
<IconButton
label="step-backward"
icon={<PreviousIcon />}
onClick={stepBackward}
disabled={!canStepBackward}
/>
<IconButton
{...(playing
? {
label: "pause",
icon: <PauseIcon />,
onClick: () => pause(),
disabled: !canPause,
}
: {
label: "play",
icon: <PlayIcon />,
onClick: () => play(),
disabled: !canPlay,
color: "primary",
})}
/>
<IconButton
label="step-forward"
icon={<NextIcon />}
onClick={stepForward}
disabled={!canStepForward}
/>
<IconButton
label="next-breakpoint"
icon={<SkipIcon />}
onClick={() => {
stepTo(findBreakpoint());
}}
disabled={!canStepForward}
/>
{divider}
<PopupState variant="popover">
{(state) => (
<>
<Button sx={{ minWidth: 0 }} {...bindTrigger(state)}>
<Typography
component="div"
variant="body2"
color="text.secondary"
sx={{
px: 0.25,
py: 0.25,
textAlign: "center",
...paper(0),
borderRadius: 1,
}}
>
{step}
</Typography>
</Button>
<Popover
{...bindPopover(state)}
anchorOrigin={centered}
transformOrigin={centered}
>
{step}
</Typography>
</Button>
<Popover
{...bindPopover(state)}
anchorOrigin={centered}
transformOrigin={centered}
>
<TextField
autoFocus
onChange={(e) => setStepInput(e.target.value)}
defaultValue={step}
placeholder="0"
sx={{ width: 180, border: "none" }}
slotProps={{
input: {
sx: { fontSize: "0.875rem" },
startAdornment: (
<InputAdornment position="start">Step</InputAdornment>
),
endAdornment: (
<InputAdornment position="end">
<IconButton
icon={<ArrowForwardOutlined />}
label="Go"
size="small"
color="inherit"
disabled={
!parsedStepInputValid || parsedStepInput === step
}
onClick={() => {
stepTo(parsedStepInput);
state.close();
}}
/>
</InputAdornment>
),
}
}}
/>
</Popover>
</>
)}
</PopupState>
</>);
<TextField
autoFocus
onChange={(e) => setStepInput(e.target.value)}
defaultValue={step}
placeholder="0"
sx={{ width: 180, border: "none" }}
slotProps={{
input: {
sx: { fontSize: "0.875rem" },
startAdornment: (
<InputAdornment position="start">Step</InputAdornment>
),
endAdornment: (
<InputAdornment position="end">
<IconButton
icon={<ArrowForwardOutlined />}
label="Go"
size="small"
color="inherit"
disabled={
!parsedStepInputValid || parsedStepInput === step
}
onClick={() => {
stepTo(parsedStepInput);
state.close();
}}
/>
</InputAdornment>
),
},
}}
/>
</Popover>
</>
)}
</PopupState>
</>
);
}
export function MinimisedPlaybackControls({
layer,
Expand Down
6 changes: 3 additions & 3 deletions client/src/components/generic/ListEditor.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {
Add,
ClearOutlined as DeleteIcon,
AddOutlined as Add,
CloseOutlined as DeleteIcon,
DragHandleOutlined,
EditOutlined as EditIcon,
} from "@mui/icons-material";
} from "@mui-symbols-material/w400";
import {
Box,
Button,
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/generic/Modal.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ArrowBack } from "@mui/icons-material";
import { ArrowBackOutlined as ArrowBack } from "@mui-symbols-material/w400";
import {
AppBar,
Box,
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/generic/Overline.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FiberManualRecord as Dot } from "@mui/icons-material";
import { FiberManualRecordOutlined as Dot } from "@mui-symbols-material/w400";
import { Typography as Type, TypographyProps } from "@mui/material";
import { ComponentProps, ReactNode } from "react";

Expand Down
2 changes: 1 addition & 1 deletion client/src/components/generic/Snackbar.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CloseOutlined as CloseIcon } from "@mui/icons-material";
import { CloseOutlined as CloseIcon } from "@mui-symbols-material/w400";
import { Button, IconButton, Snackbar } from "@mui/material";
import { filter, noop } from "lodash";
import { Label } from "./Label";
Expand Down
5 changes: 4 additions & 1 deletion client/src/components/inspector/EventInspector.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { DataObjectOutlined, FiberManualRecord } from "@mui/icons-material";
import {
DataObjectOutlined,
FiberManualRecordFilledOutlined as FiberManualRecord,
} from "@mui-symbols-material/w400";
import {
Box,
Divider,
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/inspector/FileDropZone.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { WorkspacesOutlined } from "@mui/icons-material";
import { WorkspacesOutlined } from "@mui-symbols-material/w400";
import { Backdrop, Stack, Typography as Type } from "@mui/material";
import { useSnackbar } from "components/generic/Snackbar";
import { ORIGIN_FILESYSTEM, useWorkspace } from "hooks/useWorkspace";
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/inspector/Placeholder.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { WidgetsOutlined } from "@mui/icons-material";
import { WidgetsOutlined } from "@mui-symbols-material/w400";
import { Box, Typography as Type } from "@mui/material";
import { Flex, FlexProps } from "components/generic/Flex";
import { ReactElement, ReactNode } from "react";
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/inspector/TraceRenderer.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
BlurOnOutlined as DisabledIcon,
ViewInArOutlined,
} from "@mui/icons-material";
} from "@mui-symbols-material/w400";
import { Box, CircularProgress, useTheme } from "@mui/material";
import { RendererProps, SelectEvent } from "components/renderer/Renderer";
import { usePlaybackState } from "hooks/usePlaybackState";
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/inspector/TrustedContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
CheckOutlined,
DoneAllOutlined,
ShieldOutlined,
} from "@mui/icons-material";
} from "@mui-symbols-material/w400";
import { Link, Stack } from "@mui/material";
import { ReactNode } from "react";
import { Placeholder } from "./Placeholder";
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/inspector/ViewControls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
MoreVertOutlined as MoreIcon,
OpenInNewOutlined as PopOutIcon,
ViewAgendaOutlined as SplitIcon,
} from "@mui/icons-material";
} from "@mui-symbols-material/w400";
import {
Box,
Divider,
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/inspector/ViewTree.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Split, { SplitDirection } from "@devbookhq/splitter";
import { DragIndicatorOutlined } from "@mui/icons-material";
import { DragIndicatorOutlined } from "@mui-symbols-material/w400";
import { Box, useTheme } from "@mui/material";
import { Flex } from "components/generic/Flex";
import {
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/layer-editor/LayerListEditor.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { MoreVertOutlined } from "@mui/icons-material";
import { MoreVertOutlined } from "@mui-symbols-material/w400";
import { Box, IconButton, Menu, MenuItem, MenuList } from "@mui/material";
import { ListEditor } from "components/generic/ListEditor";
import { head, map } from "lodash";
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/settings-editor/RendererEditor.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EditOutlined as EditIcon } from "@mui/icons-material";
import { EditOutlined as EditIcon } from "@mui-symbols-material/w400";
import {
Box,
Chip,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ReplayOutlined as ResetIcon } from "@mui/icons-material";
import { ReplayOutlined as ResetIcon } from "@mui-symbols-material/w400";
import { Box } from "@mui/material";
import { defaultTransport } from "client";
import { FeaturePickerButton } from "components/app-bar/FeaturePickerButton";
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/settings-editor/ServerListEditor.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ReplayOutlined as ResetIcon } from "@mui/icons-material";
import { ReplayOutlined as ResetIcon } from "@mui-symbols-material/w400";
import { Box } from "@mui/material";
import { defaultTransport } from "client";
import { FeaturePickerButton } from "components/app-bar/FeaturePickerButton";
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/title-bar/ExportWorkspaceModal.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DownloadOutlined } from "@mui/icons-material";
import { DownloadOutlined } from "@mui-symbols-material/w400";
import { Box, Stack, TextField, Typography } from "@mui/material";
import { Button } from "components/generic/Button";
import Modal, { ModalAppBar } from "components/generic/Modal";
Expand Down
Loading

0 comments on commit 2b81e73

Please sign in to comment.