Skip to content

refactor(site): Improve and fix loading buttons #7719

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.

Sign up for GitHub

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 4 commits into from
May 31, 2023
Merged

refactor(site): Improve and fix loading buttons #7719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3d195c
Fix buttons
BrunoQuaresma May 30, 2023
40e88b5
Rollback padding
BrunoQuaresma May 30, 2023
23c721e
Fix padding
BrunoQuaresma May 30, 2023
dfde0b9
Fix proxy skeleton
BrunoQuaresma May 30, 2023
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
3 changes: 2 additions & 1 deletion site/src/components/Navbar/NavbarView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import Divider from "@mui/material/Divider"
import HelpOutline from "@mui/icons-material/HelpOutline"
import Tooltip from "@mui/material/Tooltip"
import Skeleton from "@mui/material/Skeleton"
import { BUTTON_SM_HEIGHT } from "theme/theme"

export const USERS_LINK = `/users?filter=${encodeURIComponent("status:active")}`

Expand Down Expand Up @@ -195,7 +196,7 @@ const ProxyMenu: FC<{ proxyContextValue: ProxyContextValue }> = ({
return (
<Skeleton
width="160px"
height={30}
height={BUTTON_SM_HEIGHT}
sx={{ borderRadius: "4px", transform: "none" }}
/>
)
Expand Down
11 changes: 10 additions & 1 deletion site/src/components/UserDropdown/UsersDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { BorderedMenu } from "../BorderedMenu/BorderedMenu"
import { CloseDropdown, OpenDropdown } from "../DropdownArrows/DropdownArrows"
import { UserAvatar } from "../UserAvatar/UserAvatar"
import { UserDropdownContent } from "../UserDropdownContent/UserDropdownContent"
import { BUTTON_SM_HEIGHT } from "theme/theme"

export interface UserDropdownProps {
user: TypesGen.User
Expand Down Expand Up @@ -42,7 +43,15 @@ export const UserDropdown: FC<PropsWithChildren<UserDropdownProps>> = ({
>
<div className={styles.inner}>
<Badge overlap="circular">
<UserAvatar username={user.username} avatarURL={user.avatar_url} />
<UserAvatar
sx={{
width: BUTTON_SM_HEIGHT,
height: BUTTON_SM_HEIGHT,
fontSize: 16,
}}
username={user.username}
avatarURL={user.avatar_url}
/>
</Badge>
{anchorEl ? (
<CloseDropdown color={colors.gray[6]} />
Expand Down
5 changes: 1 addition & 4 deletions site/src/components/WorkspaceActions/WorkspaceActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,7 @@ export const WorkspaceActions: FC<WorkspaceActionsProps> = ({
? buttonMapping[ButtonTypesEnum.updating]
: buttonMapping[ButtonTypesEnum.update])}
{isRestarting && buttonMapping[ButtonTypesEnum.restarting]}
{!isRestarting &&
actionsByStatus.map((action) => (
<span key={action}>{buttonMapping[action]}</span>
))}
{!isRestarting && actionsByStatus.map((action) => buttonMapping[action])}
{canCancel && <CancelButton handleAction={handleCancel} />}
<div>
<IconButton
Expand Down
29 changes: 20 additions & 9 deletions site/src/theme/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { ThemeOptions, createTheme, Theme } from "@mui/material/styles"
import { BODY_FONT_FAMILY, borderRadius } from "./constants"

// MUI does not have aligned heights for buttons and inputs so we have to "hack" it a little bit
const BUTTON_LG_HEIGHT = 42
const BUTTON_MD_HEIGHT = 36
const BUTTON_SM_HEIGHT = 30
export const BUTTON_LG_HEIGHT = 40
export const BUTTON_MD_HEIGHT = 36
export const BUTTON_SM_HEIGHT = 32

export type PaletteIndex = keyof Theme["palette"]
export type PaletteStatusIndex = Extract<
Expand Down Expand Up @@ -110,6 +110,8 @@ dark = createTheme(dark, {
},
},
},
// Button styles are based on
// https://tailwindui.com/components/application-ui/elements/buttons
MuiButtonBase: {
defaultProps: {
disableRipple: true,
Expand All @@ -127,20 +129,26 @@ dark = createTheme(dark, {
fontWeight: 500,
height: BUTTON_MD_HEIGHT,
padding: theme.spacing(1, 2),
borderRadius: "6px",
fontSize: 14,

whiteSpace: "nowrap",
":focus-visible": {
outline: `2px solid ${theme.palette.primary.main}`,
},

"& .MuiLoadingButton-loadingIndicator": {
width: 14,
height: 14,
},

"& .MuiLoadingButton-loadingIndicator .MuiCircularProgress-root": {
width: "inherit !important",
height: "inherit !important",
},
}),
sizeSmall: {
borderRadius: 6,
height: BUTTON_SM_HEIGHT,

"& .MuiCircularProgress-root": {
width: "14px !important",
height: "14px !important",
},
},
sizeLarge: {
height: BUTTON_LG_HEIGHT,
Expand Down Expand Up @@ -174,6 +182,9 @@ dark = createTheme(dark, {
fontSize: 13,
},
},
startIcon: {
marginLeft: "-2px",
},
},
},
MuiTableContainer: {
Expand Down