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
Next Next commit
feedback
  • Loading branch information
aslilac committed Dec 4, 2023
commit 294281c6c7c7563c9913535a97c50b6e71349877
4 changes: 2 additions & 2 deletions site/src/pages/IconsPage/IconsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const IconsPage: FC = () => {
<Tooltip
placement="bottom-end"
title={
<div
<p
css={{
padding: 8,
fontSize: 13,
Expand All @@ -90,7 +90,7 @@ export const IconsPage: FC = () => {
public GitHub repository. Just keep in mind that it should be
relevant to many Coder users, and redistributable under a
permissive license.
</div>
</p>
}
>
<Link href="https://github.com/coder/coder/tree/main/site/static/icon">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const ScheduleDialog: FC<PropsWithChildren<ScheduleDialogProps>> = ({
<div css={styles.dialogDescription}>{`
This change will result in ${inactiveWorkspacesToGoDormant} workspaces being immediately transitioned to the dormant state and ${inactiveWorkspacesToGoDormantInWeek} over the next seven days. To prevent this, do you want to reset the inactivity period for all template workspaces?`}</div>
<FormControlLabel
css={{ marginTop: 2 }}
css={{ marginTop: 16 }}
control={
<Checkbox
size="small"
Expand All @@ -90,13 +90,13 @@ export const ScheduleDialog: FC<PropsWithChildren<ScheduleDialogProps>> = ({
<>
<h4>Dormancy Auto-Deletion</h4>
<Stack direction="row" spacing={5}>
<div css={styles.dialogDescription}>
<p css={styles.dialogDescription}>
This change will result in {dormantWorkspacesToBeDeleted}{" "}
workspaces being immediately deleted and{" "}
{dormantWorkspacesToBeDeletedInWeek} over the next 7 days. To
prevent this, do you want to reset the dormancy period for all
template workspaces?
</div>
</p>
<FormControlLabel
css={{ marginTop: 2 }}
control={
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ const Form: FC<FormProps> = ({
);
})}
</FormFields>
<div css={{ padding: "24px 8px" }}>
<div css={{ paddingTop: "24px", paddingBottom: "8px" }}>
<Button
data-testid="build-parameters-submit"
type="submit"
Expand Down
4 changes: 2 additions & 2 deletions site/src/pages/WorkspacesPage/WorkspacesButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ export const WorkspacesButton: FC<WorkspacesButtonProps> = ({
css={{
display: "flex",
flexDirection: "column",
padding: "0 8px",
paddingTop: "8px",
paddingBottom: "8px",
}}
>
{templatesFetchStatus === "loading" ? (
Expand Down Expand Up @@ -105,7 +106,6 @@ export const WorkspacesButton: FC<WorkspacesButtonProps> = ({
display: "flex",
alignItems: "center",
columnGap: 12,

color: theme.palette.primary.main,
})}
>
Expand Down
3 changes: 2 additions & 1 deletion site/src/pages/WorkspacesPage/WorkspacesSearchBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ export const SearchBox = forwardRef(function SearchBox(
css={{
display: "block",
fontSize: "14px",
margin: "auto 0",
marginLeft: "auto",
marginRight: "auto",
color: theme.palette.text.secondary,
}}
/>
Expand Down
2 changes: 1 addition & 1 deletion site/src/testHelpers/renderHelpers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ type RenderHookWithAuthOptions<Props> = Partial<
*
* @see {@link https://github.com/coder/coder/pull/10362#discussion_r1380852725}
*/
export async function renderHookWithAuth<Props, Result>(
export async function renderHookWithAuth<Result, Props>(
render: (initialProps: Props) => Result,
options: RenderHookWithAuthOptions<Props> = {},
) {
Expand Down