changed header to match new theme

This commit is contained in:
Carter 2026-06-30 09:43:38 -06:00
parent 64fcc934ce
commit 3eb66e3622
3 changed files with 27 additions and 2 deletions

View file

@ -16,7 +16,7 @@ const useStyles = makeStyles((theme: Theme) => {
appBar: { appBar: {
zIndex: theme.zIndex.drawer + 1, zIndex: theme.zIndex.drawer + 1,
backgroundImage: "none", // This prevents de-saturation of header in dark mode backgroundImage: "none", // This prevents de-saturation of header in dark mode
backgroundColor: theme.palette.mode === "light" ? "#3b3b3b" : "#272727" backgroundColor: theme.palette.header.main
}, },
toolbar: { toolbar: {
marginLeft: theme.spacing(0.5), marginLeft: theme.spacing(0.5),

View file

@ -28,6 +28,8 @@ const protips: string[] = [
"Want to receive text messages about your devices? Update your phone number and enable SMS notifications!" "Want to receive text messages about your devices? Update your phone number and enable SMS notifications!"
]; ];
const DEFAULT_HEADER_COLOUR = "#1f2a35";
export interface WhiteLabelFeatures { export interface WhiteLabelFeatures {
bins: boolean; bins: boolean;
visualFarm: boolean; visualFarm: boolean;
@ -55,6 +57,7 @@ interface WhiteLabel {
secondaryColour: any; secondaryColour: any;
signatureColour: any; signatureColour: any;
signatureAccentColour: any; signatureAccentColour: any;
headerColour?: any;
auth0ClientId: string; auth0ClientId: string;
redirectOnLogout: boolean; redirectOnLogout: boolean;
logoutRedirectTarget: string; logoutRedirectTarget: string;
@ -444,6 +447,14 @@ export function getSignatureColour(): any {
return getWhitelabel().signatureColour; return getWhitelabel().signatureColour;
} }
export function getHeaderColour(): any {
return getWhitelabel().headerColour ?? DEFAULT_HEADER_COLOUR;
}
export function getHeaderColor(): any {
return getHeaderColour();
}
export function getSignatureAccentColour(): any { export function getSignatureAccentColour(): any {
return getWhitelabel().signatureAccentColour; return getWhitelabel().signatureAccentColour;
} }

View file

@ -2,10 +2,21 @@
import * as Colours from "@mui/material/colors" import * as Colours from "@mui/material/colors"
import { createTheme, ThemeOptions } from '@mui/material/styles'; import { createTheme, ThemeOptions } from '@mui/material/styles';
import { import {
getHeaderColor,
getPrimaryColour, getPrimaryColour,
getSecondaryColour, getSecondaryColour,
} from "../services/whiteLabel"; } from "../services/whiteLabel";
declare module "@mui/material/styles" {
interface Palette {
header: Palette["primary"];
}
interface PaletteOptions {
header?: PaletteOptions["primary"];
}
}
const baseTheme: ThemeOptions = { const baseTheme: ThemeOptions = {
palette: { palette: {
mode: 'light', // default mode; will be overridden by system if needed mode: 'light', // default mode; will be overridden by system if needed
@ -62,6 +73,9 @@ export const getTheme = (mode: 'light' | 'dark') =>
...baseTheme.palette, ...baseTheme.palette,
primary: makePaletteColor(getPrimaryColour()), primary: makePaletteColor(getPrimaryColour()),
secondary: makePaletteColor(getSecondaryColour()), secondary: makePaletteColor(getSecondaryColour()),
header: {
main: getHeaderColor(),
},
mode, mode,
...(mode === 'dark' ...(mode === 'dark'
? { ? {