diff --git a/go/cmd/kjol-web/css/app.css b/go/cmd/kjol-web/css/app.css index 8ba2de9c..c8551d83 100644 --- a/go/cmd/kjol-web/css/app.css +++ b/go/cmd/kjol-web/css/app.css @@ -1,59 +1,5 @@ @import "tailwindcss"; -/* --------------------------------------------------------------------------- - Lora, vendored from Google Fonts — self-hosted, not linked. - --------------------------------------------------------------------------- - The files live in wwwroot/fonts (served by the dev server straight out of - ./wwwroot), so the app pulls no third-party request at runtime: no CDN to be - blocked, no extra DNS round trip, and no dependency on fonts.gstatic.com being - up. It is a VARIABLE font, so ONE file per style covers weights 400-700 — - hence "font-weight: 400 700" rather than a file per weight. - - Only the latin and latin-ext subsets are vendored (~120 KB in total). The - unicode-range on each face is what lets the browser skip downloading latin-ext - entirely unless the page actually uses a character from it. - - To refresh: fetch - https://fonts.googleapis.com/css2?family=Lora:ital,wght@0,400..700;1,400..700 - and re-download the woff2 URLs it names. - --------------------------------------------------------------------------- */ - -@font-face { - font-family: "Lora"; - font-style: italic; - font-weight: 400 700; /* a variable font: one file covers the whole range */ - font-display: swap; - src: url("/fonts/lora-latin-ext-italic.woff2") format("woff2"); - unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; -} - -@font-face { - font-family: "Lora"; - font-style: italic; - font-weight: 400 700; /* a variable font: one file covers the whole range */ - font-display: swap; - src: url("/fonts/lora-latin-italic.woff2") format("woff2"); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} - -@font-face { - font-family: "Lora"; - font-style: normal; - font-weight: 400 700; /* a variable font: one file covers the whole range */ - font-display: swap; - src: url("/fonts/lora-latin-ext-normal.woff2") format("woff2"); - unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; -} - -@font-face { - font-family: "Lora"; - font-style: normal; - font-weight: 400 700; /* a variable font: one file covers the whole range */ - font-display: swap; - src: url("/fonts/lora-latin-normal.woff2") format("woff2"); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} - /* --------------------------------------------------------------------------- Dark mode: `dark:` as a CLASS, not a media query. --------------------------------------------------------------------------- @@ -110,12 +56,6 @@ --color-text-on-dark: #f9fafb; --color-text-on-dark-muted: #9ca3af; - /* Lora is the body face. Declaring it as --font-sans makes it the default for - everything (Tailwind's preflight sets `font-family: var(--font-sans)` on - html), and also gives you `font-sans` as a utility. --font-serif points at it - too, so `font-serif` is not a different, unvendored face. */ - --font-sans: "Lora", ui-serif, Georgia, Cambria, "Times New Roman", serif; - --font-serif: "Lora", ui-serif, Georgia, Cambria, "Times New Roman", serif; } /* --------------------------------------------------------------------------- diff --git a/go/cmd/kjol-web/frontend/css/style.css b/go/cmd/kjol-web/frontend/css/style.css index 2e6cc110..b223880b 100644 --- a/go/cmd/kjol-web/frontend/css/style.css +++ b/go/cmd/kjol-web/frontend/css/style.css @@ -30,49 +30,6 @@ --color-primary-border: #c5d1e2; --color-accent: #1c3a66; /* navy — accent TEXT (links, eyebrow, active rows) */ - /* Lora, the same body face the Go/WASM section vendors. The woff2 files are - served out of wwwroot/fonts by the same server, so this section pays no - extra request for them — they are already in the browser's cache from the - front page. */ - --font-sans: "Lora", ui-serif, Georgia, Cambria, "Times New Roman", serif; - --font-serif: "Lora", ui-serif, Georgia, Cambria, "Times New Roman", serif; -} - -/* Lora's @font-face rules are declared HERE as well as in the Go/WASM section's - app.css, and that duplication is correct: the two sections load different - stylesheets (this compiles to bundle.min.css, that one to app.css) and a page - in this section never links the other. Each stylesheet has to stand alone. - - What is NOT duplicated is the download. Both point at the same four /fonts/*.woff2 - URLs served out of the same wwwroot, so a reader arriving here from the front page - already has them in cache and pays nothing. - - Variable fonts: one file per style covers weights 400-700, hence the range. */ -@font-face { - font-family: "Lora"; - font-style: normal; - font-weight: 400 700; - font-display: swap; - src: url("/fonts/lora-latin-normal.woff2") format("woff2"); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} - -@font-face { - font-family: "Lora"; - font-style: normal; - font-weight: 400 700; - font-display: swap; - src: url("/fonts/lora-latin-ext-normal.woff2") format("woff2"); - unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; -} - -@font-face { - font-family: "Lora"; - font-style: italic; - font-weight: 400 700; - font-display: swap; - src: url("/fonts/lora-latin-italic.woff2") format("woff2"); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* Only the font. The page's background and text colour come from the shared