diff --git a/TODO.md b/TODO.md index b1a9b64..7f67d51 100644 --- a/TODO.md +++ b/TODO.md @@ -2,6 +2,14 @@ ## Completed +- [x] Apply correct fonts site-wide + - Registered `Combined` (@font-face, replaces old `police1`) and all 4 weights of `BBBDMSans` in `common.css` + - `body` now uses `BBBDMSans` as base font + - Header brand logo keeps `Combined` + - `tfe.css`: `.tfe-title` and `.tfe-author` use `Combined` + - `apropos.css`: prose body → `BBBDMSans`; h1/h2/h3, `.apropos-section-title`, `.apropos-licences h2` → `Combined` + - Code blocks keep `Courier New` monospace + - [x] Répertoire: rename search.php → repertoire.php, 6-column layout (AP + Orientations split, Finalité du Master added), HTMX server-side intersection filter, faded entries disabled, URL-shareable state - [x] Match Accueil.png mockup - Nav: brand → "Xamxam", add Répertoire left, Licences/À Propos right diff --git a/public/assets/css/apropos.css b/public/assets/css/apropos.css index cf38cb0..e841602 100644 --- a/public/assets/css/apropos.css +++ b/public/assets/css/apropos.css @@ -35,7 +35,7 @@ /* ------------------------------------------------------------------ */ .prose { - font-family: "Courier New", Courier, monospace; + font-family: "BBBDMSans", sans-serif; font-size: 1.55rem; line-height: 1.45; color: var(--text-primary); @@ -50,7 +50,7 @@ .prose h1, .prose h2, .prose h3 { - font-family: "Courier New", Courier, monospace; + font-family: "Combined", sans-serif; font-weight: 400; margin: 1.5em 0 0.5em 0; } @@ -78,7 +78,7 @@ .prose em { font-style: italic; } .prose code { - font-family: "Courier New", Courier, monospace; + font-family: "Courier New", Courier, monospace; /* keep monospace for code */ font-size: 0.9em; background: var(--bg-tertiary); padding: .1em .3em; @@ -96,7 +96,7 @@ } .apropos-section-title { - font-family: "Courier New", Courier, monospace; + font-family: "Combined", sans-serif; font-size: 1.55rem; font-weight: 400; color: var(--text-primary); @@ -149,7 +149,7 @@ } .apropos-licences h2 { - font-family: "Courier New", Courier, monospace; + font-family: "Combined", sans-serif; font-size: 1.55rem; font-weight: 400; margin: 0 0 0.75rem 0; diff --git a/public/assets/css/common.css b/public/assets/css/common.css index 5ec6240..4ff7efe 100644 --- a/public/assets/css/common.css +++ b/public/assets/css/common.css @@ -1,13 +1,45 @@ @import url("./variables.css"); @font-face { - font-family: "police1"; + font-family: "Combined"; src: url("../fonts/Combinedd.otf") format("opentype"); font-style: normal; font-weight: 400; font-display: swap; } +@font-face { + font-family: "BBBDMSans"; + src: url("../fonts/BBBDMSans-Light.otf") format("opentype"); + font-style: normal; + font-weight: 300; + font-display: swap; +} + +@font-face { + font-family: "BBBDMSans"; + src: url("../fonts/BBBDMSans-Regular.otf") format("opentype"); + font-style: normal; + font-weight: 400; + font-display: swap; +} + +@font-face { + font-family: "BBBDMSans"; + src: url("../fonts/BBBDMSans-Medium.otf") format("opentype"); + font-style: normal; + font-weight: 500; + font-display: swap; +} + +@font-face { + font-family: "BBBDMSans"; + src: url("../fonts/BBBDMSans-Bold.otf") format("opentype"); + font-style: normal; + font-weight: 700; + font-display: swap; +} + *, *::before, *::after { @@ -22,9 +54,7 @@ body { } body { - font-family: - -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", - Arial, sans-serif; + font-family: "BBBDMSans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; background: var(--bg-primary); color: var(--text-primary); } @@ -78,7 +108,7 @@ header nav { } header nav > a { - font-family: "police1", sans-serif; + font-family: "Combined", sans-serif; font-size: 1.1rem; letter-spacing: 0.12em; text-transform: uppercase; diff --git a/public/assets/css/tfe.css b/public/assets/css/tfe.css index 2ee417c..c2e237f 100644 --- a/public/assets/css/tfe.css +++ b/public/assets/css/tfe.css @@ -42,6 +42,7 @@ /* Title (h1) — primary heading, very large */ .tfe-title { + font-family: "Combined", sans-serif; font-size: 2.2rem; font-weight: 400; color: var(--text-primary); @@ -52,6 +53,7 @@ /* Author (p) — large but secondary */ .tfe-author { + font-family: "Combined", sans-serif; font-size: 1.9rem; font-weight: 400; color: var(--text-primary);