diff --git a/client/package-lock.json b/client/package-lock.json index 629678180..f6adb320d 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -93,6 +93,7 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz", "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==", "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "^7.29.7", "@babel/generator": "^7.29.7", @@ -408,6 +409,7 @@ "node_modules/@emotion/react": { "version": "11.14.0", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.18.3", "@emotion/babel-plugin": "^11.13.5", @@ -445,6 +447,7 @@ "node_modules/@emotion/styled": { "version": "11.14.1", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.18.3", "@emotion/babel-plugin": "^11.13.5", @@ -1233,6 +1236,7 @@ "node_modules/@mui/material": { "version": "7.3.7", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.28.4", "@mui/core-downloads-tracker": "^7.3.7", @@ -1337,6 +1341,7 @@ "node_modules/@mui/system": { "version": "7.3.7", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.28.4", "@mui/private-theming": "^7.3.7", @@ -2381,6 +2386,7 @@ "version": "24.5.2", "devOptional": true, "license": "MIT", + "peer": true, "dependencies": { "undici-types": "~7.12.0" } @@ -2396,6 +2402,7 @@ "node_modules/@types/react": { "version": "18.3.27", "license": "MIT", + "peer": true, "dependencies": { "@types/prop-types": "*", "csstype": "^3.2.2" @@ -2486,6 +2493,7 @@ "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==", "dev": true, "license": "BSD-2-Clause", + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "7.18.0", "@typescript-eslint/types": "7.18.0", @@ -2766,6 +2774,7 @@ "version": "8.15.0", "dev": true, "license": "MIT", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -3122,6 +3131,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "baseline-browser-mapping": "^2.10.42", "caniuse-lite": "^1.0.30001800", @@ -3565,7 +3575,8 @@ }, "node_modules/dayjs": { "version": "1.11.13", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/debug": { "version": "4.4.3", @@ -3964,6 +3975,7 @@ "version": "8.57.1", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -4776,6 +4788,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.27.6" }, @@ -5587,6 +5600,7 @@ "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-5.19.0.tgz", "integrity": "sha512-REhYUN8gNP3HlcIZS6QU2uy8iovl31cXsrNDkCcqWSQbCkcpdYLczqDz5PVIwNH42UQNyvukjes/RoHPDrOUmQ==", "license": "BSD-3-Clause", + "peer": true, "dependencies": { "@mapbox/geojson-rewind": "^0.5.2", "@mapbox/jsonlint-lines-primitives": "^2.0.2", @@ -6368,6 +6382,7 @@ "node_modules/react-dom": { "version": "18.3.1", "license": "MIT", + "peer": true, "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.2" @@ -6379,6 +6394,7 @@ "node_modules/react-hook-form": { "version": "7.71.1", "license": "MIT", + "peer": true, "engines": { "node": ">=18.0.0" }, @@ -6582,7 +6598,8 @@ }, "node_modules/redux": { "version": "5.0.1", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/redux-persist": { "version": "6.0.0", @@ -6732,6 +6749,7 @@ "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.62.2.tgz", "integrity": "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==", "license": "MIT", + "peer": true, "dependencies": { "@types/estree": "1.0.9" }, @@ -7573,6 +7591,7 @@ "version": "5.9.3", "devOptional": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -7710,6 +7729,7 @@ "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.3.tgz", "integrity": "sha512-NTKlcQjlAK7MlQoyb6LgaqHc8sso/pVyUJYWMws3jg21uTJw/LddqIFPcPqP6PzpgbIcZyKI85sFE4HBrQDA8A==", "license": "MIT", + "peer": true, "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.4", diff --git a/client/src/Components/design-elements/Icon.tsx b/client/src/Components/design-elements/Icon.tsx index 3832cb764..f0de97dd4 100644 --- a/client/src/Components/design-elements/Icon.tsx +++ b/client/src/Components/design-elements/Icon.tsx @@ -8,9 +8,6 @@ interface IconProps { color?: string; } -// 16 is the house size: 17 call sites ask for it explicitly against 2 for 20, -// and the sidebar clamps to 16 in CSS. A 20px default put icons above the cap -// height of the 13px text they sit beside. const Icon = ({ icon: Icon, size = 16, strokeWidth = 1.5, color }: IconProps) => { return ( { left: 0, right: 0, zIndex: theme.zIndex.snackbar, - // `error.dark` rather than `main`: in dark mode `main` is light - // enough that MUI derives near-black contrastText, which reads as - // a warning rather than an outage on the one surface where - // urgency matters. `dark` keeps a solid red bar with white text - // in both modes, and leaves `main` alone for the ~30 places that - // use it as text or a chart mark on a dark ground. backgroundColor: theme.palette.error.dark, color: "#FFFFFF", px: theme.spacing(8), diff --git a/client/src/Components/design-elements/PageHeader.tsx b/client/src/Components/design-elements/PageHeader.tsx index 28b447bc7..5bf00c151 100644 --- a/client/src/Components/design-elements/PageHeader.tsx +++ b/client/src/Components/design-elements/PageHeader.tsx @@ -6,7 +6,7 @@ import { Link as RouterLink } from "react-router-dom"; import { useTranslation } from "react-i18next"; import { useTheme } from "@mui/material/styles"; import { ChevronLeft, HelpCircle, FileText, Code } from "lucide-react"; -import { CONTROL_HEIGHT } from "@/Utils/Theme/constants"; +import { INPUT_BASE_HEIGHT } from "@/Utils/Theme/constants"; import type { ReactNode } from "react"; @@ -110,9 +110,6 @@ export const PageHeader = ({ fontSize: 14, color: theme.palette.text.secondary, lineHeight: 1.55, - // Wide enough to hold a one-line page description at this - // size; still a cap, so it wraps rather than running the - // full width of a large monitor. maxWidth: "108ch", }} > @@ -146,7 +143,7 @@ export const PageHeader = ({ alignItems: "center", justifyContent: "center", width: 36, - height: CONTROL_HEIGHT, + height: INPUT_BASE_HEIGHT, color: theme.palette.text.secondary, borderRight: idx < linkItems.length - 1 diff --git a/client/src/Components/design-elements/SkeletonCard.tsx b/client/src/Components/design-elements/SkeletonCard.tsx index 66bb0b560..add7a69eb 100644 --- a/client/src/Components/design-elements/SkeletonCard.tsx +++ b/client/src/Components/design-elements/SkeletonCard.tsx @@ -1,5 +1,5 @@ import { Box, Stack, useTheme } from "@mui/material"; -import { CONTROL_HEIGHT } from "@/Utils/Theme/constants"; +import { INPUT_BASE_HEIGHT } from "@/Utils/Theme/constants"; interface SkeletonCardProps { width?: number | string | { xs?: number | string; md?: number | string }; @@ -45,7 +45,7 @@ export const SkeletonCard = ({ const blockStyle = { width: 55, - height: CONTROL_HEIGHT, + height: INPUT_BASE_HEIGHT, borderRadius: theme.shape.borderRadius, background: theme.palette.secondary.main, border: `1px solid ${theme.palette.divider}`, diff --git a/client/src/Components/design-elements/StatBox.tsx b/client/src/Components/design-elements/StatBox.tsx index b5e9c7834..453a83687 100644 --- a/client/src/Components/design-elements/StatBox.tsx +++ b/client/src/Components/design-elements/StatBox.tsx @@ -19,15 +19,8 @@ export const GradientBox = ({ children, palette, sx, interactive }: GradientBox) const isSmall = useMediaQuery(theme.breakpoints.down("md")); const isLight = theme.palette.mode === "light"; const paper = theme.palette.background.paper; - // In light mode `paper` is white, and lightening white is a no-op - the - // gradient collapses flat. Darken slightly towards the page ground instead. const paperStart = isLight ? darken(paper, 0.02) : lighten(paper, 0.08); const paperEnd = paper; - // Both ends stay close to `main` so MUI's derived `contrastText` still - // applies - that is white on the dark light-mode fills and near-black on - // the lighter dark-mode ones, so a bigger lift would break one or other. - // `light` is a mid-tone used for status dots and chart marks, too pale to - // use here, so the lift comes off `main` instead. const bg = palette ? `linear-gradient(135deg, ${lighten(theme.palette[palette].main, 0.12)} 0%, ${theme.palette[palette].main} 100%)` : `linear-gradient(135deg, ${paperStart} 0%, ${paperEnd} 100%)`; diff --git a/client/src/Components/design-elements/StatusBox.tsx b/client/src/Components/design-elements/StatusBox.tsx index a22af3406..a94bd0007 100644 --- a/client/src/Components/design-elements/StatusBox.tsx +++ b/client/src/Components/design-elements/StatusBox.tsx @@ -33,12 +33,6 @@ export const BGBox = ({ children, sx }: StatusBoxProps) => { bottom={0} sx={{ pointerEvents: "none", - // Deliberately far fainter than `divider` - this is texture - // behind the number, not a rule, and it must never compete - // with the box's own border. Note alpha() *replaces* the - // alpha channel, so this relies on `divider` being an opaque - // hex; if it ever goes translucent this gets stronger, not - // weaker. backgroundImage: ` linear-gradient(${alpha(theme.palette.divider, 0.4)} 1px, transparent 1px), linear-gradient(90deg, ${alpha(theme.palette.divider, 0.4)} 1px, transparent 1px) diff --git a/client/src/Components/design-elements/Tabs.tsx b/client/src/Components/design-elements/Tabs.tsx index 13ccaae77..d87b286ef 100644 --- a/client/src/Components/design-elements/Tabs.tsx +++ b/client/src/Components/design-elements/Tabs.tsx @@ -2,7 +2,7 @@ import MuiTabs from "@mui/material/Tabs"; import type { TabsProps } from "@mui/material/Tabs"; import { useTheme } from "@mui/material/styles"; import { typographyLevels } from "@/Utils/Theme/Palette"; -import { CONTROL_HEIGHT } from "@/Utils/Theme/constants"; +import { INPUT_BASE_HEIGHT } from "@/Utils/Theme/constants"; interface CustomTabsProps extends TabsProps {} export const Tabs = (props: CustomTabsProps) => { @@ -10,7 +10,7 @@ export const Tabs = (props: CustomTabsProps) => { return ( { textTransform: "none", fontSize: typographyLevels.m, fontWeight: 500, - minHeight: CONTROL_HEIGHT, + minHeight: INPUT_BASE_HEIGHT, padding: theme.spacing(1, 0), paddingBottom: 0, minWidth: "auto", alignItems: "flex-start", color: theme.palette.text.secondary, "&.Mui-selected": { - // Weight stays put, as on ToggleButton: bolding the active tab - // widens it, shifting every tab to its right and dragging the - // indicator to a moving target. Colour and the indicator are - // already carrying the state. color: theme.palette.primary.main, }, "&:hover": { diff --git a/client/src/Components/inputs/Button.tsx b/client/src/Components/inputs/Button.tsx index 65540b6c4..33bec7fe8 100644 --- a/client/src/Components/inputs/Button.tsx +++ b/client/src/Components/inputs/Button.tsx @@ -1,7 +1,7 @@ import Button from "@mui/material/Button"; import type { ButtonProps } from "@mui/material/Button"; import { useTheme, darken } from "@mui/material/styles"; -import { CONTROL_HEIGHT, HOVER } from "@/Utils/Theme/constants"; +import { INPUT_BASE_HEIGHT, HOVER } from "@/Utils/Theme/constants"; const PALETTE_COLORS = [ "primary", @@ -43,10 +43,7 @@ export const ButtonInput = ({ sx, ...props }: ButtonProps) => { {...props} sx={{ textTransform: "none", - height: CONTROL_HEIGHT, - // MUI's button line-height is 1.75 (22.75px at 13px), which with the - // 6px padding needs 34.75px - already over its own box at 34, and - // clipping at 32. 1.2 leaves room for tall scripts too. + height: INPUT_BASE_HEIGHT, lineHeight: 1.2, fontWeight: 400, borderRadius: 2, diff --git a/client/src/Components/inputs/ColorPicker.tsx b/client/src/Components/inputs/ColorPicker.tsx index 79c4d63fc..c65c3f8c7 100644 --- a/client/src/Components/inputs/ColorPicker.tsx +++ b/client/src/Components/inputs/ColorPicker.tsx @@ -4,7 +4,7 @@ import { typographyLevels } from "@/Utils/Theme/Palette"; import { useTheme } from "@mui/material"; import Stack from "@mui/material/Stack"; import { FieldLabel } from "@/Components/inputs/FieldLabel"; -import { CONTROL_HEIGHT } from "@/Utils/Theme/constants"; +import { INPUT_BASE_HEIGHT } from "@/Utils/Theme/constants"; interface ColorPickerProps extends MuiColorInputProps { fieldLabel?: string; @@ -19,7 +19,7 @@ export const ColorInput = ({ fieldLabel, required, ...props }: ColorPickerProps) sx={{ "& .MuiOutlinedInput-root": { borderRadius: theme.shape.borderRadius, - height: CONTROL_HEIGHT, + height: INPUT_BASE_HEIGHT, fontSize: typographyLevels.base, }, "& .MuiOutlinedInput-notchedOutline": { diff --git a/client/src/Components/inputs/DatePicker.tsx b/client/src/Components/inputs/DatePicker.tsx index 1cb9f7738..3d82a0fa7 100644 --- a/client/src/Components/inputs/DatePicker.tsx +++ b/client/src/Components/inputs/DatePicker.tsx @@ -8,7 +8,7 @@ import { FieldLabel } from "./FieldLabel"; import { Calendar } from "lucide-react"; import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs"; import { LocalizationProvider } from "@mui/x-date-pickers"; -import { CONTROL_HEIGHT } from "@/Utils/Theme/constants"; +import { INPUT_BASE_HEIGHT } from "@/Utils/Theme/constants"; interface DatePickerComponentProps extends Omit, "label"> { fieldLabel?: string; @@ -56,7 +56,7 @@ export const DatePickerComponent = ({ flexDirection: "row-reverse", }, "& input": { - minHeight: CONTROL_HEIGHT, + minHeight: INPUT_BASE_HEIGHT, p: 0, pl: theme.spacing(3), pr: theme.spacing(5), diff --git a/client/src/Components/inputs/Select.tsx b/client/src/Components/inputs/Select.tsx index 8481ad4f4..eda59a9d1 100644 --- a/client/src/Components/inputs/Select.tsx +++ b/client/src/Components/inputs/Select.tsx @@ -6,7 +6,7 @@ import Stack from "@mui/material/Stack"; import { FieldLabel } from "./FieldLabel"; import { ChevronDown } from "lucide-react"; import Typography from "@mui/material/Typography"; -import { CONTROL_HEIGHT } from "@/Utils/Theme/constants"; +import { INPUT_BASE_HEIGHT } from "@/Utils/Theme/constants"; interface SelectInputProps extends Omit, "label"> { fieldLabel?: string; @@ -72,7 +72,7 @@ const SelectInputInner = ( /> )} sx={{ - height: `${CONTROL_HEIGHT}px`, + height: `${INPUT_BASE_HEIGHT}px`, "& .MuiSelect-select": { display: "flex", alignItems: "center", diff --git a/client/src/Components/inputs/TextInput.tsx b/client/src/Components/inputs/TextInput.tsx index 392bfccd9..5fe644ca6 100644 --- a/client/src/Components/inputs/TextInput.tsx +++ b/client/src/Components/inputs/TextInput.tsx @@ -5,7 +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 { CONTROL_HEIGHT, LAYOUT } from "@/Utils/Theme/constants"; +import { INPUT_BASE_HEIGHT, LAYOUT } from "@/Utils/Theme/constants"; interface TextInputProps extends Omit { fieldLabel?: string; @@ -22,7 +22,7 @@ export const TextInput = forwardRef(function T width: "100%", "& .MuiOutlinedInput-root": { borderRadius: theme.shape.borderRadius, - height: props.multiline ? "auto" : CONTROL_HEIGHT, + height: props.multiline ? "auto" : INPUT_BASE_HEIGHT, fontSize: typographyLevels.base, overflow: "hidden", }, diff --git a/client/src/Components/inputs/TimePicker.tsx b/client/src/Components/inputs/TimePicker.tsx index dfefc2f3c..46345cfcb 100644 --- a/client/src/Components/inputs/TimePicker.tsx +++ b/client/src/Components/inputs/TimePicker.tsx @@ -7,7 +7,7 @@ import Typography from "@mui/material/Typography"; import { FieldLabel } from "./FieldLabel"; import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs"; import { LocalizationProvider } from "@mui/x-date-pickers"; -import { CONTROL_HEIGHT } from "@/Utils/Theme/constants"; +import { INPUT_BASE_HEIGHT } from "@/Utils/Theme/constants"; interface TimePickerComponentProps extends Omit, "label"> { fieldLabel?: string; @@ -34,7 +34,7 @@ export const TimePickerComponent = ({ sx: { width: "fit-content", "& input": { - minHeight: CONTROL_HEIGHT, + minHeight: INPUT_BASE_HEIGHT, p: 0, px: theme.spacing(5), }, diff --git a/client/src/Components/inputs/ToggleButton.tsx b/client/src/Components/inputs/ToggleButton.tsx index 0319578ae..7a344c071 100644 --- a/client/src/Components/inputs/ToggleButton.tsx +++ b/client/src/Components/inputs/ToggleButton.tsx @@ -4,7 +4,7 @@ import type { ToggleButtonProps } from "@mui/material/ToggleButton"; import type { ToggleButtonGroupProps } from "@mui/material/ToggleButtonGroup"; import { useTheme } from "@mui/material/styles"; import { alpha } from "@mui/material/styles"; -import { CONTROL_HEIGHT } from "@/Utils/Theme/constants"; +import { INPUT_BASE_HEIGHT } from "@/Utils/Theme/constants"; export const ToggleButtonInput = ({ sx, ...props }: ToggleButtonProps) => { const theme = useTheme(); @@ -21,7 +21,7 @@ export const ToggleButtonInput = ({ sx, ...props }: ToggleButtonProps) => { sx={{ px: 8, textTransform: "none", - height: CONTROL_HEIGHT, + height: INPUT_BASE_HEIGHT, fontWeight: 400, whiteSpace: "nowrap", textOverflow: "ellipsis", @@ -34,10 +34,6 @@ export const ToggleButtonInput = ({ sx, ...props }: ToggleButtonProps) => { }, "&.Mui-selected": { backgroundColor: selectedBg, - // Weight stays at 400 so the group sits level with Button, - // which it is routinely placed beside. The fill and the - // darker ink carry the selected state instead - a weight - // change also reflows the label width as you switch. color: theme.palette.text.primary, "&:hover": { backgroundColor: selectedHoverBg, diff --git a/client/src/Components/sidebar/NavItem.tsx b/client/src/Components/sidebar/NavItem.tsx index a07d68d7e..d573c884f 100644 --- a/client/src/Components/sidebar/NavItem.tsx +++ b/client/src/Components/sidebar/NavItem.tsx @@ -25,10 +25,6 @@ export const NavItem = ({ const iconStroke = selected ? theme.palette.sidebar.accent : theme.palette.text.secondary; - - // Both states come from the same family so selected always reads stronger - // than a hovered neighbour. MUI's default action.hover is lighter than - // action.selected on a dark ground, which inverted the two. const buttonBgColor = selected ? theme.palette.action.selected : "transparent"; const buttonBgHoverColor = selected ? theme.palette.action.selectedHover diff --git a/client/src/Components/sidebar/index.tsx b/client/src/Components/sidebar/index.tsx index e9a999ebd..c1d147519 100644 --- a/client/src/Components/sidebar/index.tsx +++ b/client/src/Components/sidebar/index.tsx @@ -73,9 +73,6 @@ export const Sidebar = () => { gap={theme.spacing(LAYOUT.SM)} borderRight={`1px solid ${theme.palette.divider}`} width={width} - // On `paper` rather than inheriting the page ground, so the nav - // reads as a surface and the content area stays the darker - // `default`. Opaque, so the blur it used to carry is gone. bgcolor={theme.palette.background.paper} sx={{ touchAction: "none", diff --git a/client/src/Pages/Incidents/Components/CardSummary.tsx b/client/src/Pages/Incidents/Components/CardSummary.tsx index 1334616d6..75c9672a0 100644 --- a/client/src/Pages/Incidents/Components/CardSummary.tsx +++ b/client/src/Pages/Incidents/Components/CardSummary.tsx @@ -30,9 +30,6 @@ const SummaryItem = ({ icon, label, value }: SummaryItemProps) => { direction="row" alignItems="center" gap={theme.spacing(2)} - // The icons are supporting marks beside the label, not content, - // so they take secondary ink rather than lucide's currentColor - // default, which renders them heavier than the text. sx={{ "& svg": { color: theme.palette.text.secondary } }} > {icon} diff --git a/client/src/Pages/StatusPage/Status/themes/shared/fontStacks.ts b/client/src/Pages/StatusPage/Status/themes/shared/fontStacks.ts index a3f1fe556..65bfb3f86 100644 --- a/client/src/Pages/StatusPage/Status/themes/shared/fontStacks.ts +++ b/client/src/Pages/StatusPage/Status/themes/shared/fontStacks.ts @@ -1,6 +1,3 @@ -// No "Inter" here: its webfont was never self-hosted, so once the Google Fonts -// import went it resolved to a fallback anyway. Listing it only made the stack -// look intentional on machines that happen to have Inter installed. export const SANS_STACK = '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif'; diff --git a/client/src/Utils/Theme/Palette.ts b/client/src/Utils/Theme/Palette.ts index 19ec22c85..ae3a7d89d 100644 --- a/client/src/Utils/Theme/Palette.ts +++ b/client/src/Utils/Theme/Palette.ts @@ -18,14 +18,11 @@ export const colors = { gray700: "#313131", gray900: "#151518", gray850: "#1c1c21", - // Neutral ramp, biased slightly green so it sits with the brand rather than - // against it. Opaque values - alpha-black over white reads washed out. ink900: "#101917", ink600: "#55635C", ink400: "#7C8983", surface50: "#F6F8F7", rule200: "#C7D2CC", - // Semantic colours derived from the brand rather than Material's defaults successMain: "#0D6049", errorMain: "#A02B24", warningMain: "#8C5806", @@ -60,8 +57,6 @@ export const lightPalette = { action: { rowHover: alpha(colors.gray900, HOVER.ROW), controlHover: alpha(colors.gray900, HOVER.CONTROL), - // Tinted with the brand so a selected row reads as chosen rather than - // merely dirty, and the hover step stays clearly above the resting one. selected: alpha(colors.brandGreen, 0.06), selectedHover: alpha(colors.brandGreen, 0.1), }, @@ -78,9 +73,6 @@ export const lightPalette = { disabled: colors.ink400, }, divider: colors.rule200, - // Only `main` is set. MUI derives `light`/`dark` from it, and `light` is - // consumed as a saturated colour - status dots, histogram bars, heatmap - // cells - so it must not be overridden with a pale tint. success: { main: colors.successMain, }, @@ -112,10 +104,6 @@ export const lightPalette = { export const darkPalette = { primary: { main: colors.brandGreen, - // The dark ground needs a lighter green for anything drawn as a line - // rather than a fill - focus rings especially, which were dimmer than - // their own hover state. Leaving `main` alone keeps contained buttons - // white-on-green instead of flipping them to dark text. light: colors.brandGreenLight, }, action: { diff --git a/client/src/Utils/Theme/Theme.ts b/client/src/Utils/Theme/Theme.ts index a480686a7..15b0b7c05 100644 --- a/client/src/Utils/Theme/Theme.ts +++ b/client/src/Utils/Theme/Theme.ts @@ -134,9 +134,6 @@ export const theme = (mode: string, palette: any) => styleOverrides: { root: ({ theme }) => ({ "&.Mui-focusVisible": { - // Same green as the input focus ring - `main` is only - // 2.86:1 on the dark ground, so keyboard focus was - // barely visible there. outline: `1px solid ${ theme.palette.mode === "dark" ? theme.palette.primary.light @@ -195,24 +192,14 @@ export const theme = (mode: string, palette: any) => }), }, }, - - // One border story for every outlined input - text fields, selects, - // autocompletes, date and colour pickers all route through this. - // Resting: divider. Hover: a step darker, so there is a cue without - // jumping to near-black. Focus: the brand, at 2px. MuiOutlinedInput: { styleOverrides: { - // MUI pads the inner input 8.5px top and bottom, which with an - // 18.7px line-height needs 35.7px - taller than the control - // itself, so the text was being clipped by overflow:hidden. input: { paddingTop: 0, paddingBottom: 0, height: "100%", }, root: ({ theme }) => ({ - // The Select renders a div rather than an input, so it needs - // the same treatment to sit inside the control height. "& .MuiSelect-select": { paddingTop: 0, paddingBottom: 0, diff --git a/client/src/Utils/Theme/constants.ts b/client/src/Utils/Theme/constants.ts index 1d5ed4991..950beff49 100644 --- a/client/src/Utils/Theme/constants.ts +++ b/client/src/Utils/Theme/constants.ts @@ -18,12 +18,7 @@ export const LAYOUT = { XXL: 16, } as const; -/** - * Shared height for anything that can sit in a row with something else - - * buttons, inputs, selects, pickers, toggles, tabs, icon buttons. One number so - * they share a baseline instead of drifting 2px apart. - */ -export const CONTROL_HEIGHT = 32; +export const INPUT_BASE_HEIGHT = 32; // Height for inputs/controls export const HOVER = { DARKEN: 0.06, // This is a coefficient for darkening function