Skip to content

refactor: remove usage of <Box> and sx #10702

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.

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 8 commits into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
last batch of fixes
  • Loading branch information
aslilac committed Dec 4, 2023
commit cb0de8dac96f8ae693daa02f23a318b3326923c0
4 changes: 2 additions & 2 deletions site/src/components/Dashboard/DashboardLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ export const DashboardLayout: FC = () => {
color: theme.palette.info.light,
})}
/>
<div>
<p>
Coder {updateCheck.data?.version} is now available. View the{" "}
<Link href={updateCheck.data?.url}>release notes</Link> and{" "}
<Link href={docs("/admin/upgrade")}>upgrade instructions</Link>{" "}
for more information.
</div>
</p>
</div>
}
action={
Expand Down
6 changes: 2 additions & 4 deletions site/src/components/Dashboard/Navbar/NavbarView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ const ProxyMenu: FC<ProxyMenuProps> = ({ proxyContextValue }) => {
css={{
width: "100%",
fontSize: 14,
padding: 8,
padding: 16,
maxWidth: "320px",
lineHeight: "140%",
}}
Expand Down Expand Up @@ -331,9 +331,7 @@ const ProxyMenu: FC<ProxyMenuProps> = ({ proxyContextValue }) => {
}}
key={proxy.id}
selected={proxy.id === selectedProxy?.id}
css={{
fontSize: 14,
}}
css={{ fontSize: 14 }}
>
<div
css={{
Expand Down
6 changes: 3 additions & 3 deletions site/src/components/Dashboard/useUpdateCheck.test.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { act, renderHook, waitFor } from "@testing-library/react";
import { useUpdateCheck } from "./useUpdateCheck";
import { QueryClient, QueryClientProvider } from "react-query";
import { type PropsWithChildren } from "react";
import { type FC, type PropsWithChildren } from "react";
import { rest } from "msw";
import { MockUpdateCheck } from "testHelpers/entities";
import { server } from "testHelpers/server";

const createWrapper = () => {
const createWrapper = (): FC<PropsWithChildren> => {
const queryClient = new QueryClient();
return ({ children }: PropsWithChildren) => (
return ({ children }) => (
<QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import ExpandMoreOutlined from "@mui/icons-material/ExpandMoreOutlined";
import Button from "@mui/material/Button";
import Menu from "@mui/material/Menu";
import MenuItem from "@mui/material/MenuItem";
import { useState, useRef, FC } from "react";
import { type FC, useState, useRef } from "react";
import { DateRangeValue } from "./DateRange";
import { differenceInWeeks } from "date-fns";
import { lastWeeks } from "./utils";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export const ScheduleDialog: FC<PropsWithChildren<ScheduleDialogProps>> = ({
template workspaces?
</p>
<FormControlLabel
css={{ marginTop: 2 }}
css={{ marginTop: 16 }}
control={
<Checkbox
size="small"
Expand Down