diff --git a/README.md b/README.md index 3e9e9d8..2791f61 100644 --- a/README.md +++ b/README.md @@ -17,11 +17,11 @@ hugo server --buildFuture --buildDrafts Then open http://localhost:1313 The header uses the logo dimensions in `hugo.yaml` in both languages, without -shrinking the logo to fit the text. With JavaScript enabled, screens up to 666px -wide use a flat, borderless full-width menu button at the bottom and a scrollable -panel above it. The language link spans the panel's content width, includes the -translation icon, and uses the same font size as the menu links. -The page reserves space for the button so it does not cover content. +shrinking the logo to fit the text. Screens up to 666px wide swap the main menu +and the language link in the header for a bottom navigation bar +(`themes/hackertours/layouts/_partials/mobilemenu.html`), with one entry per menu +item plus one for the language switch. The page reserves space for the bar so it +does not cover content. ## Themes @@ -30,6 +30,7 @@ that exists in more than one of them, the first theme in the list wins: ```yaml theme: + - hackertours-40c3 - hackertours - zen ``` @@ -42,6 +43,33 @@ theme: something in Zen, put a file with the same path here; for example, `assets/css/mobilemenu.css` and `assets/js/mobilemenu.js` replace Zen's mobile menu with the bottom navigation bar. +- `themes/hackertours-40c3` is the design for 40C3, after the 40C3 style guide + (PR #67): colours, the Jersey 10 and Hack fonts, square corners, and the + 40C3 logo in the footer. It contains only what differs from the generic + design: `assets/css/_custom.css` and `assets/css/_events.css` replace the + generic ones, `assets/css/_schedule-40c3.css` adjusts the schedule, and + `static/site.webmanifest` has the 40C3 colours. + +An event design adds to the page through two hooks, which are empty in +`themes/hackertours`: `layouts/_partials/event-design/head.html` (fonts, +`theme-color`) and `layouts/_partials/event-design/footer.html` (the event +logo). Changes to the generic `_custom.css` or `_events.css` don't reach the +40C3 design, which has its own copies of those files, so make them there too if +they matter during the event. + +### Switching back to the generic design + +After 40C3, remove `hackertours-40c3` from `theme` in `hugo.yaml`: + +```yaml +theme: + - hackertours + - zen +``` + +You can leave `themes/hackertours-40c3` in the repository, or delete it. To +preview the generic design without changing `hugo.yaml`, run +`hugo server --buildFuture --theme hackertours,zen`. Content, `data/` and the site-specific files in `static/` (logo, favicons, map data) stay at the top level of the repository. Don't add `layouts/`, `assets/` diff --git a/content/de/37c3/electrum/index.md b/content/de/37c3/electrum/index.md index 089b023..a5ded77 100644 --- a/content/de/37c3/electrum/index.md +++ b/content/de/37c3/electrum/index.md @@ -10,7 +10,7 @@ Das electrum ist Hamburgs Museum der Elektrizität und Technik. Ohne Strom geht {{< gallery-image src="Electrum_Hamburg-Harburg.nnw.jpg" alt="Museum electrum in Hamburg-Harburg, cc-by-sa NordNordWest" >}} {{< /gallery >}} -# Daten +## Daten * Tag 1 (27.12) **12:30 Uhr** * Dauer: 1,5h * Spache: Deutsch diff --git a/content/de/38c3/electrum/index.md b/content/de/38c3/electrum/index.md index 7e59539..3d1dcd9 100644 --- a/content/de/38c3/electrum/index.md +++ b/content/de/38c3/electrum/index.md @@ -18,7 +18,7 @@ Lizenz: (https://creativecommons.org/licenses/by-sa/3.0/de/legalcode) Das Museum wird von einem Verein geführt und unterstützt. Ihr seid herzlich dazu eingeladen, den Verein ebenfalls, entweder aktiv oder passiv, zu unterstützen, z. B. in [Form einer Vereinsmitgliedschaft](https://www.electrum-hamburg.de/content/download/71/298?version=2). -# Daten +## Daten * ~~Tag 3 (29.12.) **13:45 Uhr** Deutsch~~ ausgebucht * ~~Tag 3 (29.12.) **14:45 Uhr** Englisch~~ ausgebucht * Dauer: 1 Stunde diff --git a/content/de/_index.md b/content/de/_index.md index b6d6f8f..3b94b78 100644 --- a/content/de/_index.md +++ b/content/de/_index.md @@ -14,6 +14,8 @@ cascade: intro: Wir von Hamburg Hackertours zeigen euch die Stadt! --- +## 40C3 + Für den [40C3](https://events.ccc.de/category/40c3/) haben wir interessante Orte in und um Hamburg gefunden, an denen ihr für ein paar Stunden in andere Welten eintauchen und spannende Dinge erleben könnt. [Wie das funktioniert, erklären wir euch hier in unseren FAQ]({{< relref "faq/_index" >}})! Hackertours ist auch auf **[Mastodon](https://chaos.social/@hackertours)**! diff --git a/content/de/faq/_index.md b/content/de/faq/_index.md index 76f6388..41af9eb 100644 --- a/content/de/faq/_index.md +++ b/content/de/faq/_index.md @@ -1,5 +1,5 @@ --- -title: 'Die Hackertours für den 39C3 – FAQ' +title: '39C3 FAQ' date: 2023-12-07T18:46:19+01:00 menus: main: diff --git a/content/en/_index.md b/content/en/_index.md index 3652a68..4bef33d 100644 --- a/content/en/_index.md +++ b/content/en/_index.md @@ -14,6 +14,8 @@ cascade: intro: Let Hamburg Hackertours show you around the city! --- +## 40C3 + For [40C3](https://events.ccc.de/category/40c3/) we have found interesting places in and around Hamburg where you can delve into other worlds and experience fascinating things for a few hours. [We are going to explain how this works here in our FAQ article]({{< relref "faq/_index" >}})! Hackertours is also on **[Mastodon](https://chaos.social/@hackertours)**! diff --git a/content/en/faq/_index.md b/content/en/faq/_index.md index 413c178..33ce3ec 100644 --- a/content/en/faq/_index.md +++ b/content/en/faq/_index.md @@ -1,5 +1,5 @@ --- -title: Hackertours for 39C3 – FAQ +title: 39C3 FAQ date: 2023-12-07T18:46:19+01:00 menus: main: diff --git a/hugo.yaml b/hugo.yaml index 0859d0a..9b9fcb2 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -4,6 +4,7 @@ defaultContentLanguageInSubdir: true title: 'Hamburg Hackertours' # Stacked themes: the first one wins. See README, "Themes". theme: + - hackertours-40c3 - hackertours - zen copyright: "[CCC Hansestadt Hamburg e.V.](https://hamburg.ccc.de) ist nur der Vermittler der Touren. Für das Angebot und die Durchführung der Touren sind die jeweiligen Veranstalter verantwortlich." diff --git a/themes/hackertours-40c3/assets/css/_custom.css b/themes/hackertours-40c3/assets/css/_custom.css new file mode 100644 index 0000000..81258b9 --- /dev/null +++ b/themes/hackertours-40c3/assets/css/_custom.css @@ -0,0 +1,490 @@ +@import './_schedule.css'; +@import './_schedule-40c3.css'; +@import './_tour-map.css'; +@import './_gallery.css'; +@import './_events.css'; + +/* + * 40C3 "MODEL_CITIZENS" design, after the 40C3 styleguide and the 40C3 startpage + * (events.ccc.de/congress/2026/infos/startpage.html). + * Key colours: green (0), paper (A) and ink (B); the other colours are accents. + * Dark: ink background, paper text, green accents. + * Light: paper background and ink text. + * Paper is the startpage's light green (#dff0d4), not the styleguide's grey (#ebedf0). + * WCAG AA contrast: on ink every palette colour works as text, but on the light background + * only the foreground does. So in the light scheme green is only ever a fill or a line, + * with foreground-coloured text on it. + */ +:root { + --c40-green: #75b44b; + --c40-teal: #15ada3; + --c40-periwinkle: #9fa4e8; + --c40-lilac: #c892d6; + --c40-pink: #ee5da2; + --c40-coral: #ea6f82; + --c40-orange: #f88a30; + --c40-amber: #ffbc40; + --c40-paper: #dff0d4; + --c40-ink: #001300; + + --c40-light-bg: var(--c40-paper); + --c40-light-fg: var(--c40-ink); + + /* Text on green and amber fills. */ + --c40-on-fill: light-dark(var(--c40-light-fg), var(--c40-ink)); + + /* Hack has a large x-height, so 16px reads about as big as the old 18px serif. */ + --base-font-size: 16; + + /* Jersey 10 is a small pixel font; it needs about this much more size to match Hack. */ + --display-scale: 1.45; + + /* On macOS, Menlo has the same character width as Hack, so text doesn't move when Hack takes + over. Not ui-monospace: that is SF Mono in Safari, which is wider. */ + --ff-body: 'Hack', Menlo, Consolas, monospace; + --ff-headings: var(--ff-body); + --ff-alt: var(--ff-body); + --ff-monospace: var(--ff-body); + --ff-display: 'Jersey 10', var(--ff-body); + + /* Square corners, like the pixel boxes in the styleguide. */ + --radius-xl: 0; + --radius-l: 0; + --radius-m: 0; + --radius-s: 0; + --radius-xs: 0; + + --color-body-bg: light-dark(var(--c40-light-bg), var(--c40-ink)); + --color-page-bg: transparent; + --color-header-bg: transparent; + --color-footer-bg: transparent; + + --color-text: light-dark(var(--c40-light-fg), var(--c40-paper)); + --color-text-bg: light-dark(var(--c40-light-bg), var(--c40-ink)); + --color-text-meta: light-dark( + color-mix(in srgb, var(--c40-light-fg) 78%, var(--c40-light-bg)), + color-mix(in srgb, var(--c40-paper) 80%, var(--c40-ink)) + ); + --color-headings: var(--color-text); + --color-code: var(--color-text); + + --color-link: light-dark(var(--c40-light-fg), var(--c40-green)); + --color-link-visited: var(--color-link); + --color-link-hover: var(--c40-on-fill); + --color-link-active: var(--c40-on-fill); + + --color-button: var(--c40-green); + --color-button-text: var(--c40-on-fill); + --color-button-hover: var(--c40-amber); + --color-button-text-hover: var(--c40-on-fill); + + --color-border: light-dark(var(--c40-light-fg), var(--c40-green)); + --color-border-light: var(--color-border); + --color-border-dark: var(--color-border); + + --color-mobile-menu: var(--color-body-bg); + + --color-accent: var(--c40-green); + --color-highlight: var(--c40-amber); + --color-mark-highlight: var(--c40-amber); + --color-row-odd: light-dark( + color-mix(in srgb, var(--c40-light-fg) 7%, var(--c40-light-bg)), + color-mix(in srgb, var(--c40-paper) 9%, var(--c40-ink)) + ); + + --color-info: var(--c40-teal); + --color-success: var(--c40-green); + --color-warning: var(--c40-amber); + --color-error: var(--c40-coral); + + --color-focus: light-dark(var(--c40-light-fg), var(--c40-amber)); +} + +:focus-visible { + outline: 3px solid var(--color-focus); + outline-offset: 2px; +} + +/* Long URLs, the e-mail address and long German words would otherwise make pages wider than a + phone screen, and mobile browsers then zoom the whole page out. Links get `anywhere` because + break-word doesn't shrink the theme's table-style lists (`article > ul`). */ +body { + overflow-wrap: break-word; +} + +.layout__main a { + overflow-wrap: anywhere; +} + +/* Links: underlined, and a green chip with dark text on hover and focus (AA in both schemes). */ +a:hover, +a:focus-visible { + background: var(--c40-green); +} + +.header__logo:hover, +.header__logo:focus-visible { + background: none; +} + +mark { + color: var(--c40-on-fill); +} + +/* Headings: Jersey 10 for the big ones, as on the 40C3 startpage. Page titles (h1) are capitals + in the foreground colour (green in the dark scheme), section headings (h2) capitals on a green + box. Post titles in lists and the schedule's days are plain h2s, the size of the card titles. + h3 and below are Hack Bold, h3 underlined like the styleguide's subheads. */ +h1, +h2 { + color: light-dark(var(--c40-light-fg), var(--c40-green)); + font-family: var(--ff-display); + /* Jersey 10 has a single weight; like the startpage, this has browsers draw it bolder. */ + font-weight: bold; + letter-spacing: 0; + line-height: normal; +} + +h1 { + font-size: min(3rem, calc(var(--fs-xxl) * var(--display-scale))); + text-transform: uppercase; +} + +h2 { + font-size: calc(var(--fs-l) * var(--display-scale)); +} + +h2:not(.title, .schedule__day-title) { + width: fit-content; + padding-inline: 1rem; + background: var(--c40-green); + color: var(--c40-on-fill); + font-size: min(2.4rem, calc(var(--fs-xl) * var(--display-scale))); + text-transform: uppercase; +} + +h3 { + font-size: var(--fs-l); + text-decoration: underline; + text-decoration-thickness: 2px; + text-underline-offset: 0.25em; +} + +.title-post-date { + display: block; + margin-left: 0; + color: var(--color-text-meta); + font-family: var(--ff-body); + font-size: var(--fs-s); + letter-spacing: 0; +} + +/* The line breaks in the home page's intro text are meant. */ +.intro-text { + white-space: pre-line; +} + +/* Branding: the logo, and the site name set like the page titles. */ +.header { + color: var(--color-text); +} + +.header__logo { + flex-shrink: 0; +} + +.header__logo-image { + width: 50px; + height: 50px; +} + +@media (width >= 667px) { + .header__logo-image { + width: 100px; + height: 100px; + } +} + +.header__site-name { + flex-shrink: 1; + min-width: 0; + margin-block: 0; +} + +@media (width <= 666px) { + .header__site-name { + font-size: calc(var(--fs-l) * var(--display-scale)); + } +} + +/* The name takes the heading's colour; on hover and focus it gets the links' green chip, with + dark text, because green text would vanish on it. */ +.header__site-link { + &:link, + &:visited { + color: inherit; + } + + &:hover, + &:focus-visible { + color: var(--c40-on-fill); + text-decoration: underline; + } +} + +/* Links in text keep their underline: the link colour alone is too close to the text colour. */ +nav a, +.header a { + text-decoration: none; +} + +/* Main menu: a row of full-width buttons (the items grow to fill the theme's flex row). Quiet, + outlined boxes; the current page, hover and focus are filled green like a loud header. */ +.main-menu li { + flex-grow: 1; + text-align: center; +} + +.main-menu a { + padding: 0.3rem 0.75rem; + background: transparent; + box-shadow: inset 0 0 0 2px var(--color-border); + color: var(--color-text); + text-decoration: none; + + &:hover, + &:focus-visible, + &[aria-current] { + background: var(--c40-green); + box-shadow: none; + color: var(--c40-on-fill); + text-decoration: none; + } +} + +/* Language switch, on the right of the header: an amber chip with the icon, so it doesn't read + as a menu entry. */ +.language-selector { + font-size: inherit; + + a { + display: flex; + align-items: center; + gap: 0.45em; + padding: 0.3rem 0.75rem; + background: var(--c40-amber); + color: var(--c40-on-fill); + text-decoration: none; + + &:hover, + &:focus-visible { + background: var(--c40-green); + color: var(--c40-on-fill); + } + } +} + +.language-icon { + inline-size: 1.1em; + block-size: 1.1em; + flex-shrink: 0; + margin: 0; + fill: currentcolor; +} + +/* + * Mobile bottom bar (layouts/_partials/mobilemenu.html, below 667px). The theme lays it out; this + * dresses it like the main menu: the current page and hover/focus are filled green, the language + * switch is the amber one, and 2px dividers make the row of boxes. + */ +.mobile-bottom-nav { + border-block-start: 2px solid var(--color-border); +} + +.mobile-bottom-nav__item + .mobile-bottom-nav__item { + border-inline-start: 2px solid var(--color-border); +} + +.mobile-bottom-nav__link { + color: var(--color-text); + + &[aria-current='page'] { + background: var(--c40-green); + color: var(--c40-on-fill); + } + + &[hreflang] { + background: var(--c40-amber); + color: var(--c40-on-fill); + } + + &:focus-visible { + background: var(--c40-green); + color: var(--c40-on-fill); + outline-color: var(--c40-on-fill); + outline-offset: -6px; + } + + /* Touch screens keep :hover after a tap. */ + @media (hover: hover) { + &:hover { + background: var(--c40-green); + color: var(--c40-on-fill); + } + } +} + +/* Keep focused and scrolled-to elements clear of the bar. */ +@media (width <= 666px) { + :root { + scroll-padding-block-end: 6rem; + } +} + +/* Buttons: flat fills. */ +.button { + background: var(--color-button); + border-color: var(--color-button); + + &:hover, + &:focus-visible { + background: var(--color-button-hover); + border-color: var(--color-button-hover); + } +} + +table, +th, +td { + border: 1px solid; +} + +th, +td { + padding: 3px 6px; + font-variant-numeric: tabular-nums; +} + +/* + * Footer: a pixel ruler after the styleguide's boxes pattern instead of a plain line. + * One frame (top/bottom borders) with a divider per cell; the width snaps down to + * whole cells and the divider tile repeats into the end padding to close the last box, + * so there are no cut-off cells or doubled lines. Without round(), `round` repeat + * stretches the cells to fit instead. + */ +.footer { + --ruler-line: 0.125rem; + --ruler-cell: 0.75rem; + + border-block-start: 0; + + &::before { + content: ''; + display: block; + box-sizing: border-box; + inline-size: 100%; + inline-size: calc(round(down, 100% - var(--ruler-line), var(--ruler-cell)) + var(--ruler-line)); + block-size: calc(var(--ruler-cell) + var(--ruler-line)); + margin-inline: auto; + margin-block-end: var(--spacing-s); + padding-inline-end: var(--ruler-line); + border-block: var(--ruler-line) solid var(--color-border); + background: linear-gradient(to right, var(--color-border) var(--ruler-line), transparent 0) 0 0 / + var(--ruler-cell) 100% round no-repeat content-box border-box; + } +} + +.footer__logo { + display: block; + margin-block: var(--spacing-xs); + + img { + display: block; + width: auto; + height: 3.5rem; + margin-inline: auto; + } +} + +.event-logo { + display: block; + margin-block: var(--spacing-s); + + img { + display: block; + width: auto; + height: 5rem; + } +} + +/* Visible when focused with the keyboard; the visually-hidden class hides it otherwise. */ +.skip-link:focus { + position: absolute; + inset-block-start: 0.5rem; + inset-inline-start: 0.5rem; + z-index: 100; + padding: 0.5rem 1rem; + background: var(--color-button); + color: var(--color-button-text); +} + +#main-content:focus { + outline: none; +} + +/* Content images with their credit, see layouts/_markup/render-image.html. */ +.content-image { + margin: 1rem 0; + + img { + display: block; + max-width: 100%; + height: auto; + } +} + +span.content-image { + display: inline-block; + vertical-align: top; + max-width: 100%; + margin: 0 0.5rem 0.5rem 0; +} + +.content-image__credit { + display: block; + margin-block-start: 0.25rem; + font-family: var(--ff-alt); + font-size: var(--fs-xs); + color: var(--color-text-meta); +} + +/* Calendar links after a tour date, see layouts/_shortcodes/calendar.html. + The links are at least 24 pixels high, so they are easy to hit (WCAG 2.5.8). */ +.tour-calendar { + display: inline-flex; + align-items: center; + gap: 0.4em; + margin-inline-start: 0.4em; + padding: 0 0.6em; + border: 1px solid color-mix(in oklch, var(--color-text) 25%, transparent); + border-radius: 999px; + font-family: var(--ff-alt); + font-size: var(--fs-xs); + vertical-align: middle; + white-space: nowrap; + + a { + display: inline-flex; + align-items: center; + min-height: 24px; + } +} + +.tour-calendar__separator { + color: var(--color-text-meta); +} + +.fa-icon { + width: 1em; + height: 1em; +} diff --git a/themes/hackertours-40c3/assets/css/_events.css b/themes/hackertours-40c3/assets/css/_events.css new file mode 100644 index 0000000..d572660 --- /dev/null +++ b/themes/hackertours-40c3/assets/css/_events.css @@ -0,0 +1,147 @@ +/* + * Event cards on the home page (events shortcode), after the cards on the 40C3 start page + * (events.ccc.de/congress/2026/infos/startpage.html): a frame with a heading bar that holds the + * event's logo, drawn in the text colour like the start page's icons. Cards of past events link to + * their tours and fill the heading bar on hover and focus; an event in progress is greyed out. + */ + +.event-cards { + --event-card-line: 0.125rem; + + /* The start page's neutrals for inactive cards; text contrast about 5.5:1 (light) and 6.5:1 (dark). */ + --event-card-inactive-bg: light-dark(#c9dabf, #162915); + --event-card-inactive-line: light-dark(#b2c4aa, #2d3f2a); + --event-card-inactive-text: light-dark(#435540, #9cae94); + + display: grid; + grid-template-columns: repeat(auto-fill, minmax(min(19rem, 100%), 1fr)); + gap: 2rem; + margin-block: 0 var(--spacing-m); + padding: 0; + list-style: none; +} + +.event-cards__item { + max-width: none; +} + +.event-card { + display: flex; + flex-direction: column; + block-size: 100%; + border: var(--event-card-line) solid var(--c40-green); + background: var(--color-body-bg); + color: var(--color-text); + text-decoration: none; +} + +.event-card__heading { + display: flex; + align-items: center; + justify-content: space-between; + gap: 1rem; + padding: 0.5rem 1rem; + border-block-end: var(--event-card-line) solid var(--c40-green); + color: light-dark(var(--c40-light-fg), var(--c40-green)); +} + +.event-card__title { + max-width: none; + margin: 0; + color: inherit; + font-family: var(--ff-display); + font-size: calc(var(--fs-l) * var(--display-scale)); + font-weight: bold; + line-height: 1; + text-decoration: none; +} + +/* The logo as a mask in the text colour, 2rem high (the start page's size-8 icons); wide + wordmarks shrink to leave room for the title. */ +.event-card__logo { + flex: none; + max-inline-size: 60%; + block-size: 2rem; + background-color: currentcolor; + mask: var(--event-logo) right center / contain no-repeat; +} + +.event-card__body { + display: flex; + flex-direction: column; + flex-grow: 1; + gap: 0.25rem; + padding: 0.5rem 1rem 0.75rem; + + p { + margin: 0; + } +} + +.event-card__motto { + font-weight: bold; +} + +.event-card__meta { + color: var(--color-text-meta); + font-size: var(--fs-s); +} + +.event-card__status { + align-self: flex-start; + margin-block-start: 0.25rem; + padding: 0.1rem 0.5rem; + border: var(--event-card-line) solid currentcolor; + font-size: var(--fs-xs); + font-weight: bold; + letter-spacing: 0.03em; + text-transform: uppercase; + width: 100%; + text-align: center; + margin-top: 0.5em !important; +} + +.event-card--inactive { + border-color: var(--event-card-inactive-line); + background: var(--event-card-inactive-bg); + color: var(--event-card-inactive-text); + + .event-card__heading { + border-color: var(--event-card-inactive-line); + color: inherit; + } + + .event-card__meta { + color: inherit; + } +} + +/* Hover and focus: the heading bar is filled, ink in the light scheme and green in the dark one, + and the text below is underlined like a link. */ +a.event-card:hover, +a.event-card:focus-visible { + border-color: light-dark(var(--c40-ink), var(--c40-green)); + background: var(--color-body-bg); + + .event-card__heading { + border-color: light-dark(var(--c40-ink), var(--c40-green)); + background: light-dark(var(--c40-ink), var(--c40-green)); + color: light-dark(var(--c40-green), var(--c40-ink)); + } + + .event-card__body { + text-decoration: underline; + } +} + +/* Forced colours drop background colours, and with them the masked logos. */ +@media (forced-colors: active) { + .event-card__logo { + background-color: CanvasText; + forced-color-adjust: none; + } + + a.event-card .event-card__logo { + background-color: LinkText; + } +} diff --git a/themes/hackertours-40c3/assets/css/_fonts.css b/themes/hackertours-40c3/assets/css/_fonts.css new file mode 100644 index 0000000..783d6ee --- /dev/null +++ b/themes/hackertours-40c3/assets/css/_fonts.css @@ -0,0 +1,2 @@ +/* The @font-face rules are not part of this bundle: head/fonts.html generates them from + assets/css/fonts.css.tmpl, and explains why. */ diff --git a/themes/hackertours-40c3/assets/css/_schedule-40c3.css b/themes/hackertours-40c3/assets/css/_schedule-40c3.css new file mode 100644 index 0000000..1c456a0 --- /dev/null +++ b/themes/hackertours-40c3/assets/css/_schedule-40c3.css @@ -0,0 +1,17 @@ +/* 40C3 changes to the schedule (themes/hackertours/assets/css/_schedule.css): green accent, + Jersey 10 day titles, square language badges, dark text on the picked day. */ +.schedule { + --schedule-accent: var(--c40-green); +} + +.schedule__day-title { + font-size: calc(var(--fs-l) * var(--display-scale)); +} + +.schedule__lang { + border-radius: 0; +} + +.schedule__pick[aria-pressed="true"] { + color: var(--c40-on-fill); +} diff --git a/themes/hackertours-40c3/assets/css/fonts.css.tmpl b/themes/hackertours-40c3/assets/css/fonts.css.tmpl new file mode 100644 index 0000000..1830d9a --- /dev/null +++ b/themes/hackertours-40c3/assets/css/fonts.css.tmpl @@ -0,0 +1,60 @@ +{{- /* Rendered by layouts/_partials/head/fonts.html, which explains why. */ -}} +{{- $url := dict -}} +{{- range slice "Jersey10-latin-ext" "Hack-Regular" "Hack-Italic" "Hack-Bold" "Hack-BoldItalic" -}} + {{- $url = merge $url (dict . (resources.Get (printf "fonts/%s.woff2" .) | fingerprint).RelPermalink) -}} +{{- end -}} +{{- $jersey := (resources.Get "fonts/Jersey10-latin.woff2").Content | base64Encode -}} +/* 40C3 "MODEL_CITIZENS" styleguide fonts, self-hosted (SIL OFL / MIT, see static/fonts). + Jersey 10: headings. Hack: body text and subheads. + Hack is subset to Latin (Latin-1, Latin Extended-A, general punctuation). */ + +/* The Latin subset of Jersey 10 is embedded, so German and English headings are never drawn in the fallback font. */ +@font-face { + font-family: 'Jersey 10'; + src: url('data:font/woff2;base64,{{ $jersey }}') format('woff2'); + font-weight: 400; + font-style: normal; + font-display: swap; + 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: 'Jersey 10'; + src: url('{{ index $url "Jersey10-latin-ext" }}') format('woff2'); + font-weight: 400; + font-style: normal; + font-display: swap; + 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: 'Hack'; + src: url('{{ index $url "Hack-Regular" }}') format('woff2'); + font-weight: 400; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Hack'; + src: url('{{ index $url "Hack-Italic" }}') format('woff2'); + font-weight: 400; + font-style: italic; + font-display: swap; +} + +@font-face { + font-family: 'Hack'; + src: url('{{ index $url "Hack-Bold" }}') format('woff2'); + font-weight: 700; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Hack'; + src: url('{{ index $url "Hack-BoldItalic" }}') format('woff2'); + font-weight: 700; + font-style: italic; + font-display: swap; +} diff --git a/themes/hackertours-40c3/assets/fonts/Hack-Bold.woff2 b/themes/hackertours-40c3/assets/fonts/Hack-Bold.woff2 new file mode 100644 index 0000000..792a8e0 Binary files /dev/null and b/themes/hackertours-40c3/assets/fonts/Hack-Bold.woff2 differ diff --git a/themes/hackertours-40c3/assets/fonts/Hack-BoldItalic.woff2 b/themes/hackertours-40c3/assets/fonts/Hack-BoldItalic.woff2 new file mode 100644 index 0000000..60f2451 Binary files /dev/null and b/themes/hackertours-40c3/assets/fonts/Hack-BoldItalic.woff2 differ diff --git a/themes/hackertours-40c3/assets/fonts/Hack-Italic.woff2 b/themes/hackertours-40c3/assets/fonts/Hack-Italic.woff2 new file mode 100644 index 0000000..e16f0d2 Binary files /dev/null and b/themes/hackertours-40c3/assets/fonts/Hack-Italic.woff2 differ diff --git a/themes/hackertours-40c3/assets/fonts/Hack-Regular.woff2 b/themes/hackertours-40c3/assets/fonts/Hack-Regular.woff2 new file mode 100644 index 0000000..d41cc1c Binary files /dev/null and b/themes/hackertours-40c3/assets/fonts/Hack-Regular.woff2 differ diff --git a/themes/hackertours-40c3/assets/fonts/Jersey10-latin-ext.woff2 b/themes/hackertours-40c3/assets/fonts/Jersey10-latin-ext.woff2 new file mode 100644 index 0000000..43623ab Binary files /dev/null and b/themes/hackertours-40c3/assets/fonts/Jersey10-latin-ext.woff2 differ diff --git a/themes/hackertours-40c3/assets/fonts/Jersey10-latin.woff2 b/themes/hackertours-40c3/assets/fonts/Jersey10-latin.woff2 new file mode 100644 index 0000000..babec4e Binary files /dev/null and b/themes/hackertours-40c3/assets/fonts/Jersey10-latin.woff2 differ diff --git a/themes/hackertours-40c3/assets/img/40c3/logo-text-0.svg b/themes/hackertours-40c3/assets/img/40c3/logo-text-0.svg new file mode 100644 index 0000000..243635d --- /dev/null +++ b/themes/hackertours-40c3/assets/img/40c3/logo-text-0.svg @@ -0,0 +1,39 @@ + + \ No newline at end of file diff --git a/themes/hackertours-40c3/assets/img/40c3/logo-text-b.svg b/themes/hackertours-40c3/assets/img/40c3/logo-text-b.svg new file mode 100644 index 0000000..925ec23 --- /dev/null +++ b/themes/hackertours-40c3/assets/img/40c3/logo-text-b.svg @@ -0,0 +1,39 @@ + + \ No newline at end of file diff --git a/themes/hackertours-40c3/layouts/_partials/event-design/footer.html b/themes/hackertours-40c3/layouts/_partials/event-design/footer.html new file mode 100644 index 0000000..ca53599 --- /dev/null +++ b/themes/hackertours-40c3/layouts/_partials/event-design/footer.html @@ -0,0 +1,2 @@ +{{- /* 40C3: the event's logo at the top of the footer. */ -}} +
diff --git a/themes/hackertours-40c3/layouts/_partials/event-design/head.html b/themes/hackertours-40c3/layouts/_partials/event-design/head.html new file mode 100644 index 0000000..616b635 --- /dev/null +++ b/themes/hackertours-40c3/layouts/_partials/event-design/head.html @@ -0,0 +1,4 @@ +{{- /* 40C3: fonts, and browser UI colours, the same as the page backgrounds in assets/css/_custom.css. */ -}} +{{ partial "head/fonts.html" . }} + + diff --git a/themes/hackertours-40c3/layouts/_partials/head/fonts.html b/themes/hackertours-40c3/layouts/_partials/head/fonts.html new file mode 100644 index 0000000..0318665 --- /dev/null +++ b/themes/hackertours-40c3/layouts/_partials/head/fonts.html @@ -0,0 +1,25 @@ +{{- /* +Self-hosted fonts: Jersey 10 for headings and Hack for everything else (assets/fonts, licences in +static/fonts). Their @font-face rules are generated from assets/css/fonts.css.tmpl instead of +being part of the main stylesheet. A web font that arrives after the first paint swaps in and +moves the page: Jersey 10 is far narrower than the monospace fallback, so the heading chips +changed their width, and the page transition made that visible on every language switch. + +- The Latin subset of Jersey 10 is embedded in the stylesheet, so it is there at the first paint + whatever the connection, and without a request that the browser would have to revalidate. +- Hack is preloaded, so the body text is not first drawn in a fallback font of a different + character width (SF Mono in Safari, Consolas on Windows). Its URL here and in @font-face come + from the same fingerprinted resource, so they are identical (and correct below a sub path, as + on the PR previews). +*/ -}} +{{- with resources.Get "css/fonts.css.tmpl" | resources.ExecuteAsTemplate "css/fonts.tmpl.css" . }} + {{- /* The executed template has no media type (from ".tmpl"), which minify needs. */ -}} + {{- with resources.FromString "css/fonts.css" .Content | minify | fingerprint }} + + {{- end }} +{{- end }} +{{- range slice "Hack-Regular" "Hack-Bold" }} + {{- with resources.Get (printf "fonts/%s.woff2" .) | fingerprint }} + + {{- end }} +{{- end }} diff --git a/themes/hackertours-40c3/layouts/_partials/logo-40c3.html b/themes/hackertours-40c3/layouts/_partials/logo-40c3.html new file mode 100644 index 0000000..f17a402 --- /dev/null +++ b/themes/hackertours-40c3/layouts/_partials/logo-40c3.html @@ -0,0 +1,10 @@ +{{- /* +40C3 text logo, picked to suit the colour scheme: green on dark, dark text colour on light. +Params: class (optional, on the picture element). +*/ -}} +{{- $light := resources.Get "img/40c3/logo-text-b.svg" -}} +{{- $dark := resources.Get "img/40c3/logo-text-0.svg" -}} +{{ with site.Copyright }}{{ . | site.Home.RenderString }}{{ else }}© {{ site.Title }}{{ end }}
{{- if .HasShortcode "events" }} {{- $credits := slice }} diff --git a/themes/hackertours/layouts/_partials/head/extra.html b/themes/hackertours/layouts/_partials/head/extra.html index bc6605d..74fd6b7 100644 --- a/themes/hackertours/layouts/_partials/head/extra.html +++ b/themes/hackertours/layouts/_partials/head/extra.html @@ -1,3 +1,4 @@ +{{ partial "event-design/head.html" . }} {{- /* Open Graph image for link previews. The theme's head/meta.html writes og:image only for the "image" param; without it, this uses the first image in the page, a Markdown image or a