Skip to content

chore: replace MUI icons - 4 #17748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 9, 2025
Merged

chore: replace MUI icons - 4 #17748

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ff8b96
chore: replace MUI icons - 4
BrunoQuaresma May 9, 2025
4a92175
Run FMT
BrunoQuaresma May 9, 2025
f9b1765
Fix styles
BrunoQuaresma May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix styles
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed May 9, 2025
commit f9b176508af5ec94e29629d6a86ebe40b8a6fa22
6 changes: 1 addition & 5 deletions site/src/components/FileUpload/FileUpload.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const FileUpload: FC<FileUploadProps> = ({
{isUploading ? (
<CircularProgress size={32} />
) : (
<CloudUploadIcon className="size-icon-lg" css={styles.icon} />
<CloudUploadIcon className="size-16" />
)}
</div>

Expand Down Expand Up @@ -164,10 +164,6 @@ const styles = {
justifyContent: "center",
},

icon: {
fontSize: 64,
},

title: {
fontSize: 16,
lineHeight: "1",
Expand Down
8 changes: 6 additions & 2 deletions site/src/components/FullPageLayout/Topbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
cloneElement,
forwardRef,
} from "react";
import { cn } from "utils/cn";

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

export const TopbarIcon = forwardRef<HTMLOrSVGElement, TopbarIconProps>(
(props: TopbarIconProps, ref) => {
const { children, ...restProps } = props;
const { children, className, ...restProps } = props;
const theme = useTheme();

return cloneElement(
Expand All @@ -101,7 +102,10 @@ export const TopbarIcon = forwardRef<HTMLOrSVGElement, TopbarIconProps>(
{
...restProps,
ref,
className: css({ fontSize: 16, color: theme.palette.text.disabled }),
className: cn([
css({ fontSize: 16, color: theme.palette.text.disabled }),
"size-icon-sm",
]),
},
);
},
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ export const WorkspaceTopbar: FC<WorkspaceProps> = ({
{shouldDisplayDormantData && (
<TopbarData>
<TopbarIcon>
<TrashIcon className="size-icon-sm" />
<TrashIcon />
</TopbarIcon>
<Link
component={RouterLink}
Expand Down
Loading