Skip to content

Commit 0a0b1cf

Browse files
committed
Fix a few style inconsistencies
1 parent 9fdb4fd commit 0a0b1cf

File tree

4 files changed

+30
-16
lines changed

4 files changed

+30
-16
lines changed

site/src/pages/DeploymentSettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPageView.tsx

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@ import TableHead from "@mui/material/TableHead";
1010
import TableRow from "@mui/material/TableRow";
1111
import type * as TypesGen from "api/typesGenerated";
1212
import { ErrorAlert } from "components/Alert/ErrorAlert";
13-
import { Avatar, AvatarImage } from "components/Avatar/Avatar";
13+
import {
14+
Avatar,
15+
AvatarFallback,
16+
AvatarImage,
17+
avatarLetter,
18+
} from "components/Avatar/Avatar";
1419
import { AvatarData } from "components/Avatar/AvatarData";
1520
import { SettingsHeader } from "components/SettingsHeader/SettingsHeader";
1621
import { Stack } from "components/Stack/Stack";
@@ -98,16 +103,13 @@ const OAuth2AppRow: FC<OAuth2AppRowProps> = ({ app }) => {
98103
return (
99104
<TableRow key={app.id} data-testid={`app-${app.id}`} {...clickableProps}>
100105
<TableCell>
101-
<AvatarData
102-
title={app.name}
103-
avatar={
104-
Boolean(app.icon) && (
105-
<Avatar variant="icon" size="lg">
106-
<AvatarImage src={app.icon} />
107-
</Avatar>
108-
)
109-
}
110-
/>
106+
<Stack direction="row" spacing={1}>
107+
<Avatar variant="icon">
108+
<AvatarImage src={app.icon} />
109+
<AvatarFallback>{avatarLetter(app.name)}</AvatarFallback>
110+
</Avatar>
111+
<span className="font-semibold">{app.name}</span>
112+
</Stack>
111113
</TableCell>
112114

113115
<TableCell>

site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ const ExternalAuthRow: FC<ExternalAuthRowProps> = ({
165165
<AvatarImage src={app.display_icon} />
166166
<AvatarFallback>{avatarLetter(name)}</AvatarFallback>
167167
</Avatar>
168-
{name}
168+
<span className="font-semibold">{name}</span>
169169
{/*
170170
* If the link is authenticated and has a refresh token, show that it will automatically
171171
* attempt to authenticate when the token expires.

site/src/pages/WorkspaceSettingsPage/Sidebar.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ import ParameterIcon from "@mui/icons-material/CodeOutlined";
22
import GeneralIcon from "@mui/icons-material/SettingsOutlined";
33
import ScheduleIcon from "@mui/icons-material/TimerOutlined";
44
import type { Workspace } from "api/typesGenerated";
5-
import { Avatar, AvatarFallback, AvatarImage } from "components/Avatar/Avatar";
5+
import {
6+
Avatar,
7+
AvatarFallback,
8+
AvatarImage,
9+
avatarLetter,
10+
} from "components/Avatar/Avatar";
611
import {
712
Sidebar as BaseSidebar,
813
SidebarHeader,
@@ -22,7 +27,7 @@ export const Sidebar: FC<SidebarProps> = ({ username, workspace }) => {
2227
avatar={
2328
<Avatar variant="icon">
2429
<AvatarImage>{workspace.template_icon}</AvatarImage>
25-
<AvatarFallback>{workspace.name}</AvatarFallback>
30+
<AvatarFallback>{avatarLetter(workspace.name)}</AvatarFallback>
2631
</Avatar>
2732
}
2833
title={workspace.name}

site/src/pages/WorkspacesPage/WorkspacesTable.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ import TableHead from "@mui/material/TableHead";
1111
import TableRow from "@mui/material/TableRow";
1212
import { visuallyHidden } from "@mui/utils";
1313
import type { Template, Workspace } from "api/typesGenerated";
14-
import { Avatar, AvatarFallback, AvatarImage } from "components/Avatar/Avatar";
14+
import {
15+
Avatar,
16+
AvatarFallback,
17+
AvatarImage,
18+
avatarLetter,
19+
} from "components/Avatar/Avatar";
1520
import { AvatarData } from "components/Avatar/AvatarData";
1621
import { AvatarDataSkeleton } from "components/Avatar/AvatarDataSkeleton";
1722
import { InfoTooltip } from "components/InfoTooltip/InfoTooltip";
@@ -188,7 +193,9 @@ export const WorkspacesTable: FC<WorkspacesTableProps> = ({
188193
avatar={
189194
<Avatar variant="icon">
190195
<AvatarImage src={workspace.template_icon} />
191-
<AvatarFallback>{workspace.name}</AvatarFallback>
196+
<AvatarFallback>
197+
{avatarLetter(workspace.name)}
198+
</AvatarFallback>
192199
</Avatar>
193200
}
194201
/>

0 commit comments

Comments
 (0)