Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion biome.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
"options": {
"paths": {
"@mui/material": "Use @mui/material/<name> instead. See: https://material-ui.com/guides/minimizing-bundle-size/.",
"@mui/icons-material": "Use @mui/icons-material/<name> instead. See: https://material-ui.com/guides/minimizing-bundle-size/.",
"@mui/material/Avatar": "Use components/Avatar/Avatar instead.",
"@mui/material/Alert": "Use components/Alert/Alert instead.",
"@mui/material/Popover": "Use components/Popover/Popover instead.",
Expand Down
1 change: 0 additions & 1 deletion site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
"@fontsource/jetbrains-mono": "5.2.5",
"@fontsource/source-code-pro": "5.2.5",
"@monaco-editor/react": "4.7.0",
"@mui/icons-material": "5.18.0",
"@mui/material": "5.18.0",
"@mui/system": "5.18.0",
"@mui/utils": "5.17.1",
Expand Down
22 changes: 0 additions & 22 deletions site/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions site/src/pages/LoginPage/OAuthSignInForm.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import GitHubIcon from "@mui/icons-material/GitHub";
import { visuallyHidden } from "@mui/utils";
import type { AuthMethods } from "api/typesGenerated";
import { Button } from "components/Button/Button";
import { ExternalImage } from "components/ExternalImage/ExternalImage";
import { KeyIcon } from "lucide-react";
import { type FC, useId } from "react";
import { Language } from "./Language";
Expand Down Expand Up @@ -33,7 +33,7 @@ export const OAuthSignInForm: FC<OAuthSignInFormProps> = ({
redirectTo,
)}`}
>
<GitHubIcon />
<ExternalImage src="/icon/github.svg" />
{Language.githubSignIn}
</a>
</Button>
Expand Down
9 changes: 2 additions & 7 deletions site/src/pages/SetupPage/SetupPageView.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import GitHubIcon from "@mui/icons-material/GitHub";
import AlertTitle from "@mui/material/AlertTitle";
import Autocomplete from "@mui/material/Autocomplete";
import Checkbox from "@mui/material/Checkbox";
Expand All @@ -10,6 +9,7 @@ import type * as TypesGen from "api/typesGenerated";
import { isAxiosError } from "axios";
import { Alert, AlertDetail } from "components/Alert/Alert";
import { Button } from "components/Button/Button";
import { ExternalImage } from "components/ExternalImage/ExternalImage";
import { FormFields, VerticalForm } from "components/Form/Form";
import { CoderIcon } from "components/Icons/CoderIcon";
import { PasswordField } from "components/PasswordField/PasswordField";
Expand Down Expand Up @@ -98,11 +98,6 @@ const numberOfDevelopersOptions = [
"2500+",
];

const iconStyles = {
width: 16,
height: 16,
};

interface SetupPageViewProps {
onSubmit: (firstUser: TypesGen.CreateFirstUserRequest) => void;
error?: unknown;
Expand Down Expand Up @@ -174,7 +169,7 @@ export const SetupPageView: FC<SetupPageViewProps> = ({
<>
<Button className="w-full" asChild type="submit" size="lg">
<a href="/api/v2/users/oauth2/github/callback">
<GitHubIcon css={iconStyles} />
<ExternalImage src="/icon/github.svg" />
{Language.githubCreate}
</a>
</Button>
Expand Down
4 changes: 2 additions & 2 deletions site/src/pages/TaskPage/TaskStatusLink.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import GitHub from "@mui/icons-material/GitHub";
import { Button } from "components/Button/Button";
import { ExternalImage } from "components/ExternalImage/ExternalImage";
import {
BugIcon,
ExternalLinkIcon,
Expand Down Expand Up @@ -41,7 +41,7 @@ export const TaskStatusLink: FC<TaskStatusLinkProps> = ({ uri }) => {
: `${org}/${repo} issue`;
break;
default:
icon = <GitHub />;
icon = <ExternalImage src="/icon/github.svg" />;
if (org && repo) {
label = `${org}/${repo}`;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { useTheme } from "@emotion/react";
import GitHubIcon from "@mui/icons-material/GitHub";
import Link from "@mui/material/Link";
import TextField from "@mui/material/TextField";
import { API } from "api/api";
Expand All @@ -13,6 +12,7 @@ import type {
import { Button } from "components/Button/Button";
import { ConfirmDialog } from "components/Dialogs/ConfirmDialog/ConfirmDialog";
import { EmptyState } from "components/EmptyState/EmptyState";
import { ExternalImage } from "components/ExternalImage/ExternalImage";
import { Stack } from "components/Stack/Stack";
import { CircleCheck as CircleCheckIcon, KeyIcon } from "lucide-react";
import { type FC, useState } from "react";
Expand Down Expand Up @@ -155,7 +155,7 @@ export const SingleSignOnSection: FC<SingleSignOnSectionProps> = ({
disabled={isUpdating}
onClick={() => openConfirmation("github")}
>
<GitHubIcon />
<ExternalImage src="/icon/github.svg" />
GitHub
</Button>
)}
Expand Down Expand Up @@ -204,7 +204,7 @@ export const SingleSignOnSection: FC<SingleSignOnSectionProps> = ({
</span>
<div css={{ marginLeft: "auto", lineHeight: 1 }}>
{userLoginType.login_type === "github" ? (
<GitHubIcon css={{ width: 16, height: 16 }} />
<ExternalImage src="/icon/github.svg" />
) : (
<OIDCIcon oidcAuth={authMethods.oidc} />
)}
Expand Down
4 changes: 2 additions & 2 deletions site/src/pages/UsersPage/UsersTable/UsersTableBody.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import type { Interpolation, Theme } from "@emotion/react";
import GitHub from "@mui/icons-material/GitHub";
import Skeleton from "@mui/material/Skeleton";
import type { GroupsByUserId } from "api/queries/groups";
import type * as TypesGen from "api/typesGenerated";
Expand All @@ -16,6 +15,7 @@ import {
DropdownMenuTrigger,
} from "components/DropdownMenu/DropdownMenu";
import { EmptyState } from "components/EmptyState/EmptyState";
import { ExternalImage } from "components/ExternalImage/ExternalImage";
import { LastSeen } from "components/LastSeen/LastSeen";
import { TableCell, TableRow } from "components/Table/Table";
import {
Expand Down Expand Up @@ -269,7 +269,7 @@ const LoginType: FC<LoginTypeProps> = ({ authMethods, value }) => {
icon = <BanIcon css={styles.icon} />;
} else if (value === "github") {
displayName = "GitHub";
icon = <GitHub css={styles.icon} />;
icon = <ExternalImage src="/icon/github.svg" css={styles.icon} />;
} else if (value === "token") {
displayName = "Token";
icon = <KeyIcon css={styles.icon} />;
Expand Down
9 changes: 0 additions & 9 deletions site/src/theme/light/mui.ts
Original file line number Diff line number Diff line change
Expand Up @@ -186,15 +186,6 @@ const muiTheme = createTheme({
}),
},
},
MuiIconButton: {
styleOverrides: {
root: {
"&.Mui-focusVisible": {
boxShadow: `0 0 0 2px ${tw.blue[600]}`,
},
},
},
},
},
});

Expand Down
10 changes: 0 additions & 10 deletions site/src/theme/mui.ts
Original file line number Diff line number Diff line change
Expand Up @@ -322,14 +322,4 @@ export const components = {
},
},
},

MuiIconButton: {
styleOverrides: {
root: {
"&.Mui-focusVisible": {
boxShadow: `0 0 0 2px ${tw.blue[400]}`,
},
},
},
},
} satisfies ThemeOptions["components"];
Loading