Skip to content

Commit 00224b8

Browse files
presleyppresleyp
committed
Change throughout
1 parent 1ad8f67 commit 00224b8

File tree

6 files changed

+25
-53
lines changed

6 files changed

+25
-53
lines changed

‎site/src/components/PreferencesLayout/PreferencesLayout.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import Box from "@material-ui/core/Box"
22
import React from "react"
33
import { Outlet } from "react-router-dom"
44
import { AuthAndFrame } from "../AuthAndFrame/AuthAndFrame"
5+
import { Margins } from "../Margins/Margins"
56
import { TabPanel } from "../TabPanel/TabPanel"
67

78
export const Language = {
@@ -23,11 +24,11 @@ export const PreferencesLayout: React.FC = () => {
2324
return (
2425
<AuthAndFrame>
2526
<Box display="flex" flexDirection="column">
26-
<Box style={{ maxWidth: "1380px", margin: "1em auto" }}>
27+
<Margins>
2728
<TabPanel title={Language.preferencesLabel} menuItems={menuItems}>
2829
<Outlet />
2930
</TabPanel>
30-
</Box>
31+
</Margins>
3132
</Box>
3233
</AuthAndFrame>
3334
)

‎site/src/forms/CreateTemplateForm.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { FormSection } from "../components/FormSection/FormSection"
1010
import { FormTextField } from "../components/FormTextField/FormTextField"
1111
import { FormTitle } from "../components/FormTitle/FormTitle"
1212
import { LoadingButton } from "../components/LoadingButton/LoadingButton"
13+
import { maxWidth } from "../theme/constants"
1314

1415
export interface CreateTemplateFormProps {
1516
provisioners: Provisioner[]
@@ -121,7 +122,7 @@ export const CreateTemplateForm: React.FC<CreateTemplateFormProps> = ({
121122

122123
const useStyles = makeStyles(() => ({
123124
root: {
124-
maxWidth: "1380px",
125+
maxWidth,
125126
width: "100%",
126127
display: "flex",
127128
flexDirection: "column",

‎site/src/forms/CreateWorkspaceForm.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { FormSection } from "../components/FormSection/FormSection"
99
import { FormTextField } from "../components/FormTextField/FormTextField"
1010
import { FormTitle } from "../components/FormTitle/FormTitle"
1111
import { LoadingButton } from "../components/LoadingButton/LoadingButton"
12+
import { maxWidth } from "../theme/constants"
1213

1314
export interface CreateWorkspaceForm {
1415
template: Template
@@ -82,7 +83,7 @@ export const CreateWorkspaceForm: React.FC<CreateWorkspaceForm> = ({ template, o
8283

8384
const useStyles = makeStyles(() => ({
8485
root: {
85-
maxWidth: "1380px",
86+
maxWidth,
8687
width: "100%",
8788
display: "flex",
8889
flexDirection: "column",

‎site/src/pages/TemplatesPages/OrganizationPage/TemplatePage/TemplatePage.tsx

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import Paper from "@material-ui/core/Paper"
2-
import { makeStyles } from "@material-ui/core/styles"
31
import React from "react"
42
import { Link, useNavigate, useParams } from "react-router-dom"
53
import useSWR from "swr"
@@ -8,12 +6,13 @@ import { EmptyState } from "../../../../components/EmptyState/EmptyState"
86
import { ErrorSummary } from "../../../../components/ErrorSummary/ErrorSummary"
97
import { Header } from "../../../../components/Header/Header"
108
import { FullScreenLoader } from "../../../../components/Loader/FullScreenLoader"
9+
import { Margins } from "../../../../components/Margins/Margins"
10+
import { Stack } from "../../../../components/Stack/Stack"
1111
import { Column, Table } from "../../../../components/Table/Table"
1212
import { unsafeSWRArgument } from "../../../../util"
1313
import { firstOrItem } from "../../../../util/array"
1414

1515
export const TemplatePage: React.FC = () => {
16-
const styles = useStyles()
1716
const navigate = useNavigate()
1817
const { template: templateName, organization: organizationName } = useParams()
1918

@@ -82,7 +81,7 @@ export const TemplatePage: React.FC = () => {
8281
}
8382

8483
return (
85-
<div className={styles.root}>
84+
<Stack spacing={4}>
8685
<Header
8786
title={firstOrItem(templateName, "")}
8887
description={firstOrItem(organizationName, "")}
@@ -93,25 +92,9 @@ export const TemplatePage: React.FC = () => {
9392
}}
9493
/>
9594

96-
<Paper style={{ maxWidth: "1380px", margin: "1em auto", width: "100%" }}>
95+
<Margins>
9796
<Table {...tableProps} />
98-
</Paper>
99-
</div>
97+
</Margins>
98+
</Stack>
10099
)
101100
}
102-
103-
const useStyles = makeStyles((theme) => ({
104-
root: {
105-
display: "flex",
106-
flexDirection: "column",
107-
},
108-
header: {
109-
display: "flex",
110-
flexDirection: "row-reverse",
111-
justifyContent: "space-between",
112-
margin: "1em auto",
113-
maxWidth: "1380px",
114-
padding: theme.spacing(2, 6.25, 0),
115-
width: "100%",
116-
},
117-
}))

‎site/src/pages/TemplatesPages/TemplatesPage.tsx

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import { EmptyState } from "../../components/EmptyState/EmptyState"
99
import { ErrorSummary } from "../../components/ErrorSummary/ErrorSummary"
1010
import { Header } from "../../components/Header/Header"
1111
import { FullScreenLoader } from "../../components/Loader/FullScreenLoader"
12+
import { Margins } from "../../components/Margins/Margins"
13+
import { Stack } from "../../components/Stack/Stack"
1214
import { Column, Table } from "../../components/Table/Table"
1315

1416
export const TemplatesPage: React.FC = () => {
@@ -68,20 +70,16 @@ export const TemplatesPage: React.FC = () => {
6870
const subTitle = `${templates.length} total`
6971

7072
return (
71-
<div className={styles.root}>
73+
<Stack spacing={4}>
7274
<Header title="Templates" subTitle={subTitle} />
73-
<Paper style={{ maxWidth: "1380px", margin: "1em auto", width: "100%" }}>
75+
<Margins>
7476
<Table {...tableProps} />
75-
</Paper>
76-
</div>
77+
</Margins>
78+
</Stack>
7779
)
7880
}
7981

8082
const useStyles = makeStyles((theme) => ({
81-
root: {
82-
display: "flex",
83-
flexDirection: "column",
84-
},
8583
descriptionLabel: {
8684
marginBottom: theme.spacing(1),
8785
},

‎site/src/pages/WorkspacesPage/WorkspacesPage.tsx

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import { makeStyles } from "@material-ui/core/styles"
21
import React from "react"
32
import { useParams } from "react-router-dom"
43
import useSWR from "swr"
54
import * as Types from "../../api/types"
65
import { ErrorSummary } from "../../components/ErrorSummary/ErrorSummary"
76
import { FullScreenLoader } from "../../components/Loader/FullScreenLoader"
7+
import { Margins } from "../../components/Margins/Margins"
8+
import { Stack } from "../../components/Stack/Stack"
89
import { Workspace } from "../../components/Workspace/Workspace"
910
import { unsafeSWRArgument } from "../../util"
1011
import { firstOrItem } from "../../util/array"
1112

1213
export const WorkspacePage: React.FC = () => {
13-
const styles = useStyles()
1414
const { workspace: workspaceQueryParam } = useParams()
1515

1616
const { data: workspace, error: workspaceError } = useSWR<Types.Workspace, Error>(() => {
@@ -45,22 +45,10 @@ export const WorkspacePage: React.FC = () => {
4545
}
4646

4747
return (
48-
<div className={styles.root}>
49-
<div className={styles.inner}>
48+
<Margins>
49+
<Stack spacing={4}>
5050
<Workspace organization={organization} template={template} workspace={workspace} />
51-
</div>
52-
</div>
51+
</Stack>
52+
</Margins>
5353
)
5454
}
55-
56-
const useStyles = makeStyles(() => ({
57-
root: {
58-
display: "flex",
59-
flexDirection: "column",
60-
},
61-
inner: {
62-
maxWidth: "1380px",
63-
margin: "1em auto",
64-
width: "100%",
65-
},
66-
}))

0 commit comments

Comments
 (0)