Skip to content

Commit 4abb23d

Browse files
committed
Fix typo
1 parent a24edee commit 4abb23d

File tree

11 files changed

+32
-19
lines changed

11 files changed

+32
-19
lines changed

site/src/components/AlertBanner/AlertBanner.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ interface StyleProps {
9797

9898
const useStyles = makeStyles<Theme, StyleProps>((theme) => ({
9999
alertContainer: (props) => ({
100+
...theme.typography.body2,
100101
borderColor: severityConstants[props.severity].color,
101102
border: `1px solid ${colors.orange[7]}`,
102103
borderRadius: theme.shape.borderRadius,

site/src/components/CreateUserForm/CreateUserForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export const CreateUserForm: FC<
6262
return (
6363
<FullPageForm title="Create user">
6464
<form onSubmit={form.handleSubmit} autoComplete="off">
65-
<Stack spacing={1}>
65+
<Stack spacing={2.5}>
6666
<TextField
6767
{...getFieldHelpers("username")}
6868
onChange={onChangeTrimmed(form)}

site/src/components/FormFooter/FormFooter.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export const FormFooter: FC<FormFooterProps> = ({
2828
return (
2929
<div className={styles.footer}>
3030
<LoadingButton
31+
size="large"
3132
tabIndex={0}
3233
loading={isLoading}
3334
className={styles.button}
@@ -39,6 +40,7 @@ export const FormFooter: FC<FormFooterProps> = ({
3940
{submitLabel}
4041
</LoadingButton>
4142
<Button
43+
size="large"
4244
type="button"
4345
className={styles.button}
4446
onClick={onCancel}

site/src/components/FullPageForm/FullPageForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ export const FullPageForm: FC<React.PropsWithChildren<FullPageFormProps>> = ({
3333

3434
const useStyles = makeStyles((theme) => ({
3535
pageHeader: {
36-
paddingBottom: theme.spacing(2),
36+
paddingBottom: theme.spacing(3),
3737
},
3838
}))

site/src/components/SettingsLayout/Sidebar.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ const useStyles = makeStyles((theme) => ({
132132
height: theme.spacing(2),
133133
},
134134
userInfo: {
135+
...theme.typography.body2,
135136
marginBottom: theme.spacing(2),
136137
},
137138
userData: {

site/src/components/UserAutocomplete/UserAutocomplete.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ export const UserAutocomplete: FC<UserAutocompleteProps> = ({
8989
<TextField
9090
{...params}
9191
fullWidth
92+
size="small"
9293
label={label}
9394
placeholder="User email or username"
9495
className={styles.textField}

site/src/components/UserOrGroupAutocomplete/UserOrGroupAutocomplete.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ export const UserOrGroupAutocomplete: React.FC<
9494
<TextField
9595
{...params}
9696
margin="none"
97+
size="small"
9798
placeholder="Search for user or group"
9899
InputProps={{
99100
...params.InputProps,

site/src/pages/GroupsPage/CreateGroupPageView.tsx

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { CreateGroupRequest } from "api/typesGenerated"
33
import { FormFooter } from "components/FormFooter/FormFooter"
44
import { FullPageForm } from "components/FullPageForm/FullPageForm"
55
import { Margins } from "components/Margins/Margins"
6+
import { Stack } from "components/Stack/Stack"
67
import { useFormik } from "formik"
78
import { FC } from "react"
89
import { useNavigate } from "react-router-dom"
@@ -41,21 +42,23 @@ export const CreateGroupPageView: FC<CreateGroupPageViewProps> = ({
4142
<Margins>
4243
<FullPageForm title="Create group">
4344
<form onSubmit={form.handleSubmit}>
44-
<TextField
45-
{...getFieldHelpers("name")}
46-
onChange={onChangeTrimmed(form)}
47-
autoComplete="name"
48-
autoFocus
49-
fullWidth
50-
label="Name"
51-
/>
52-
<TextField
53-
{...getFieldHelpers("avatar_url")}
54-
onChange={onChangeTrimmed(form)}
55-
autoComplete="avatar url"
56-
fullWidth
57-
label="Avatar URL"
58-
/>
45+
<Stack spacing={2.5}>
46+
<TextField
47+
{...getFieldHelpers("name")}
48+
onChange={onChangeTrimmed(form)}
49+
autoComplete="name"
50+
autoFocus
51+
fullWidth
52+
label="Name"
53+
/>
54+
<TextField
55+
{...getFieldHelpers("avatar_url")}
56+
onChange={onChangeTrimmed(form)}
57+
autoComplete="avatar url"
58+
fullWidth
59+
label="Avatar URL"
60+
/>
61+
</Stack>
5962
<FormFooter onCancel={onCancel} isLoading={isLoading} />
6063
</form>
6164
</FullPageForm>

site/src/pages/TemplateSettingsPage/Sidebar.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ const useStyles = makeStyles((theme) => ({
127127
height: theme.spacing(2),
128128
},
129129
templateInfo: {
130+
...theme.typography.body2,
130131
marginBottom: theme.spacing(2),
131132
},
132133
templateData: {

site/src/pages/WorkspaceSettingsPage/Sidebar.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ const useStyles = makeStyles((theme) => ({
123123
height: theme.spacing(2),
124124
},
125125
workspaceInfo: {
126+
...theme.typography.body2,
126127
marginBottom: theme.spacing(2),
127128
},
128129
workspaceData: {

site/src/theme/theme.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { ThemeOptions, createTheme, Theme } from "@mui/material/styles"
33
import { BODY_FONT_FAMILY, borderRadius } from "./constants"
44

55
// MUI does not have aligned heights for buttons and inputs so we have to "hack" it a little bit
6-
const INPUT_HEIGHT = 46
76
const BUTTON_LG_HEIGHT = 46
87
const BUTTON_MD_HEIGHT = 40
98
const BUTTON_SM_HEIGHT = 36
@@ -310,7 +309,10 @@ dark = createTheme(dark, {
310309
},
311310
styleOverrides: {
312311
root: {
313-
height: INPUT_HEIGHT,
312+
height: BUTTON_LG_HEIGHT,
313+
},
314+
sizeSmall: {
315+
height: BUTTON_MD_HEIGHT,
314316
},
315317
},
316318
},

0 commit comments

Comments
 (0)