diff --git a/tailwind.config.js b/tailwind.config.js
index e2be1cd..2a0efe4 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -28,25 +28,43 @@ export default {
theme: {
extend: {
fontFamily: {
- sans: ['Inter', 'sans-serif'],
- serif: ['Merriweather', 'serif'],
+ // UC Davis sets its sites in Proxima Nova (licensed, not bundled): it
+ // is used where the computer has it, and the bundled Figtree otherwise.
+ // Headings are the same face at a heavy weight, as on ucdavis.edu, so
+ // `serif` is no longer a separate face.
+ sans: ['proxima-nova', 'Figtree', 'system-ui', 'sans-serif'],
+ serif: ['proxima-nova', 'Figtree', 'system-ui', 'sans-serif'],
},
colors: {
// Load-bearing: `bg-academic-50 text-academic-900` is on , and the
- // app uses this scale throughout. The ten values are Tailwind's default
- // `slate`, but the class names in the source say `academic` — do not
- // "simplify" this away.
+ // app uses this scale throughout, so re-colouring it re-themes the app.
+ //
+ // THE UC DAVIS THEME (2026-11-04). The values are the brand tokens
+ // ucdavis.edu declares (`--ucd-blue` #022851, `--brand-primary-*`);
+ // steps marked (*) are not tokens there and sit between them. The
+ // light steps are the site's blue tints, the text steps are a
+ // blue-grey, 800 is Aggie Blue (the primary button), 900 near-black.
academic: {
- 50: '#f8fafc',
- 100: '#f1f5f9',
- 200: '#e2e8f0',
- 300: '#cbd5e1',
- 400: '#94a3b8',
- 500: '#64748b',
- 600: '#475569',
- 700: '#334155',
- 800: '#1e293b',
- 900: '#0f172a',
+ 50: '#f7fafd', // brand-primary-20
+ 100: '#ebf3fa', // brand-primary-30
+ 200: '#dbeaf7', // brand-primary-40
+ 300: '#b0d0ed', // brand-primary-60
+ 400: '#8796aa', // (*)
+ 500: '#5c6b80', // (*)
+ 600: '#45546a', // (*)
+ 700: '#14447a', // brand-primary-90
+ 800: '#022851', // ucd-blue, Aggie Blue
+ 900: '#011a36', // (*)
+ },
+ // The brand blue's brighter step, for page titles as on ucdavis.edu.
+ aggie: { 500: '#13639e' }, // brand-primary-80
+ // Aggie Gold: the accent, and the one action that matters on a screen.
+ gold: {
+ 50: '#fffbed', // brand-secondary-20
+ 100: '#fff4d2', // brand-secondary-40
+ 300: '#ffdf80', // brand-secondary-70
+ 400: '#ffd24c', // brand-secondary-80
+ 500: '#ffbf00', // ucd-gold, Aggie Gold
},
},
},
diff --git a/tests/bundle-tests.mjs b/tests/bundle-tests.mjs
index bfc6823..928673d 100644
--- a/tests/bundle-tests.mjs
+++ b/tests/bundle-tests.mjs
@@ -174,7 +174,8 @@ check('Tailwind is compiled into the stylesheet, not fetched and run', () => {
// The `academic` scale is load-bearing — wears it — and it exists only because
// tailwind.config.js carries it. Lose it and the page renders unstyled.
- assert(css.includes('#f8fafc') && css.includes('#0f172a'),
+ // Its two ends are the UC Davis tints (2026-11-04): #f7fafd and #011a36.
+ assert(css.includes('#f7fafd') && css.includes('#011a36'),
'the academic palette is missing from the stylesheet');
assert(/\.bg-academic-50[\s{,]/.test(css) && /\.text-academic-900[\s{,]/.test(css),
'the two classes actually wears were not generated');
@@ -185,14 +186,14 @@ check('Tailwind is compiled into the stylesheet, not fetched and run', () => {
assert(runtime.length === 0, `a Tailwind runtime survives in: ${runtime.join(', ')}`);
});
-check('both typefaces are emitted same-origin, with their OFL notices', () => {
+check('the typeface is emitted same-origin, with its OFL notice', () => {
const woff2 = files.filter(f => /\.woff2$/.test(f));
- for (const face of ['inter', 'merriweather']) {
+ for (const face of ['figtree']) {
assert(woff2.some(f => f.startsWith(`${face}-latin-`)),
`no ${face} woff2 was emitted — the face is not self-hosted`);
}
// OFL 1.1 requires its notice to travel with the binaries the site serves.
- for (const notice of ['fonts/Inter-OFL.txt', 'fonts/Merriweather-OFL.txt']) {
+ for (const notice of ['fonts/Figtree-OFL.txt']) {
const path = join(outDir, notice);
assert(existsSync(path), `${notice} is missing from the build`);
assert(readFileSync(path, 'utf8').includes('SIL OPEN FONT LICENSE'),
@@ -200,7 +201,7 @@ check('both typefaces are emitted same-origin, with their OFL notices', () => {
}
// Those files must be what the @font-face rules point at.
const css = readFileSync(join(assets, cssFile), 'utf8');
- for (const family of ['Inter', 'Merriweather']) {
+ for (const family of ['Figtree']) {
assert(new RegExp(`@font-face[^}]*font-family: ?['"]?${family}`, 'i').test(css),
`the stylesheet declares no @font-face for ${family}`);
}
diff --git a/vite.config.ts b/vite.config.ts
index 5a76b3a..d0aa2b0 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -43,15 +43,14 @@ const dataUriAssets = (): Plugin => {
* The SIL Open Font Licence for each self-hosted typeface, copied into the
* build from the installed package.
*
- * The deployed site distributes the Inter and Merriweather binaries, and OFL 1.1
+ * The deployed site distributes the Figtree binaries, and OFL 1.1
* requires its notice to travel with them. Read from node_modules at build time
* rather than committed as a copy, so the notice cannot drift away from the
* version actually shipped.
*/
const fontLicences = (): Plugin => {
const FACES = [
- { pkg: '@fontsource/inter', out: 'fonts/Inter-OFL.txt' },
- { pkg: '@fontsource/merriweather', out: 'fonts/Merriweather-OFL.txt' },
+ { pkg: '@fontsource/figtree', out: 'fonts/Figtree-OFL.txt' },
];
return {
name: 'gb-font-licences',