Merge branch 'develop' into feat/account-team-modals

This commit is contained in:
Alex Holliday committed 2026-04-29 09:49:23 -07:00
commit e0ac040063
8 files changed
+39 -37

No files matched your search

@@ -38,9 +38,9 @@ export const PageSpeedKeyPriorityFallback = () => {
<Link
component={RouterLink}
to="/settings"
color={theme.palette.primary.main}
fontWeight={600}
sx={{
color: theme.palette.primary.main,
fontWeight: 600,
textDecoration: "underline",
}}
/>
@@ -17,7 +17,7 @@ export const MonitorStatus = ({ monitor }: { monitor: Monitor }) => {
return (
<Stack>
<Typography
fontSize={typographyLevels.xl}
fontSize={typographyLevels.xxl}
fontWeight={500}
overflow={"hidden"}
textOverflow={"ellipsis"}
@@ -3,8 +3,10 @@ import Box from "@mui/material/Box";
import Typography from "@mui/material/Typography";
import { useTheme, alpha } from "@mui/material/styles";
import { LAYOUT } from "@/Utils/Theme/constants";
import { typographyLevels } from "@/Utils/Theme/Palette";
type Severity = "info" | "warning" | "error";
export const Severities = ["info", "warning", "error"] as const;
export type Severity = (typeof Severities)[number];
const SEVERITY_GLYPH: Record<Severity, string> = {
info: "ⓘ",
@@ -25,29 +27,26 @@ export const NoticeBanner = ({ severity = "info", children }: NoticeBannerProps)
direction="row"
alignItems="flex-start"
gap={theme.spacing(LAYOUT.SM)}
sx={{
width: "100%",
p: theme.spacing(LAYOUT.MD),
borderRadius: 1,
border: `1px solid ${alpha(tone, 0.45)}`,
backgroundColor: alpha(tone, 0.08),
textAlign: "left",
}}
width={"100%"}
p={theme.spacing(LAYOUT.MD)}
borderRadius={theme.shape.borderRadius}
border={`1px solid ${alpha(tone, 0.45)}`}
bgcolor={alpha(tone, 0.08)}
textAlign={"left"}
>
<Box
component="span"
sx={{
color: tone,
fontSize: 18,
lineHeight: 1,
mt: "2px",
}}
color={tone}
fontSize={typographyLevels.xl}
lineHeight={1}
mt={LAYOUT.XXS}
aria-hidden
>
{SEVERITY_GLYPH[severity]}
</Box>
<Typography
sx={{ color: theme.palette.text.primary, lineHeight: 1.55, fontSize: 13 }}
color={theme.palette.text.primary}
lineHeight={1.55}
>
{children}
</Typography>
+9 -9
View File
@@ -53,24 +53,24 @@ export const DialogInput = ({
>
{title && (
<DialogTitle
sx={{
pb: theme.spacing(LAYOUT.XS),
backgroundColor: theme.palette.action.hover,
borderBottom: `1px solid ${theme.palette.divider}`,
}}
pb={theme.spacing(LAYOUT.XS)}
bgcolor={theme.palette.action.hover}
borderBottom={`1px solid ${theme.palette.divider}`}
>
<Typography
component="span"
variant="h2"
sx={{ fontWeight: 600, display: "block" }}
fontWeight={600}
display={"block"}
>
{title}
</Typography>
{content && (
<Typography
variant="body1"
color="text.secondary"
sx={{ mt: theme.spacing(LAYOUT.XS), display: "block" }}
color={theme.palette.text.secondary}
mt={theme.spacing(LAYOUT.XS)}
display={"block"}
>
{content}
</Typography>
@@ -79,7 +79,7 @@ export const DialogInput = ({
)}
{children && (
<DialogContent sx={{ pt: theme.spacing(LAYOUT.MD) }}>
<Box sx={{ pt: theme.spacing(LAYOUT.XS) }}>{children}</Box>
<Box pt={theme.spacing(LAYOUT.XS)}>{children}</Box>
</DialogContent>
)}
<DialogActions
+2 -1
View File
@@ -5,6 +5,7 @@ import { typographyLevels } from "@/Utils/Theme/Palette";
import { useTheme } from "@mui/material/styles";
import Stack from "@mui/material/Stack";
import { FieldLabel } from "./FieldLabel";
import { LAYOUT } from "@/Utils/Theme/constants";
interface TextInputProps extends Omit<TextFieldProps, "label"> {
fieldLabel?: string;
@@ -56,7 +57,7 @@ export const TextInput = forwardRef<HTMLInputElement, TextInputProps>(function T
if (fieldLabel) {
return (
<Stack
spacing={theme.spacing(2)}
spacing={theme.spacing(LAYOUT.XXS)}
sx={sx}
>
<FieldLabel required={required}>{fieldLabel}</FieldLabel>
+7 -6
View File
@@ -1,12 +1,13 @@
const typographyBase = 13;
export const typographyLevels = {
base: typographyBase,
xs: `${(typographyBase - 4) / 16}rem`,
s: `${(typographyBase - 2) / 16}rem`,
m: `${typographyBase / 16}rem`,
l: `${(typographyBase + 2) / 16}rem`,
xl: `${(typographyBase + 10) / 16}rem`,
base: typographyBase, // 13px
xs: `${(typographyBase - 4) / 16}rem`, // 9px
s: `${(typographyBase - 2) / 16}rem`, // 11px
m: `${typographyBase / 16}rem`, // 13px
l: `${(typographyBase + 2) / 16}rem`, // 15px
xl: `${(typographyBase + 5) / 16}rem`, // 18px
xxl: `${(typographyBase + 10) / 16}rem`, // 23px
};
export const colors = {
+1 -1
View File
@@ -58,7 +58,7 @@ export const theme = (mode: string, palette: any) =>
fontFamilyMonospace,
fontSize: typographyLevels.base,
h1: {
fontSize: typographyLevels.xl,
fontSize: typographyLevels.xxl,
fontWeight: 500,
},
h2: {
+2 -1
View File
@@ -8,6 +8,7 @@ export const SPACING = {
} as const;
export const LAYOUT = {
XXS: 2,
XS: 4,
SM: 6,
MD: 8,
@@ -17,5 +18,5 @@ export const LAYOUT = {
} as const;
export const HOVER = {
DARKEN: 0.06,
DARKEN: 0.06, // This is a coefficient for darkening function
} as const;