diff --git a/README.md b/README.md index 71a9951..30c0898 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,11 @@ 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. +wide swap the main menu and the language link in the header for a bottom +navigation bar (`layouts/_partials/mobilemenu.html`): one box per menu entry plus +one for the language switch. The current page is filled green and the language +switch amber, as in the header menu. The page reserves space for the bar so it +does not cover content. ## Brand spelling check diff --git a/assets/css/_custom.css b/assets/css/_custom.css index ecb8a18..955209b 100644 --- a/assets/css/_custom.css +++ b/assets/css/_custom.css @@ -2,31 +2,183 @@ @import './_tour-map.css'; @import './_gallery.css'; +/* + * 40C3 "MODEL_CITIZENS" design, after the 40C3 styleguide. + * Key colours: green (0), paper (A) and ink (B); the other colours are accents. + * Dark: ink background, paper text, green accents. + * Light: #e2eed6 background and #010801 text (picked for this site, not from the styleguide). + * 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: #ebedf0; + --c40-ink: #001300; + + --c40-light-bg: #e2eed6; + --c40-light-fg: #010801; + + /* 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; + + --ff-body: 'Hack', ui-monospace, 'SF Mono', 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. h1 is the "loud header" (filled chip), h3 and below + are Hack Bold, h3 underlined like the styleguide's subheads. */ +h1, +h2 { + font-family: var(--ff-display); + font-weight: 400; + letter-spacing: 0; + line-height: 1; +} + +h1 { + width: fit-content; + max-width: 100%; + padding: 0.12em 0.3em 0.2em; + background: var(--c40-green); + color: var(--c40-on-fill); + font-size: calc(var(--fs-xxl) * var(--display-scale)); +} + +h2 { + color: light-dark(var(--c40-light-fg), var(--c40-green)); + font-size: calc(var(--fs-xl) * var(--display-scale)); +} + +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 as a loud header chip like the page's own h1. */ +.header { + color: var(--color-text); +} + .header__logo { flex-shrink: 0; } -/* Header h1 styling - responsive sizing that grows with viewport */ -.header__site-name { - font-size: var(--fs-xxl); - margin-block-start: 0; - margin-block-end: 0; - flex-shrink: 1; - min-width: 0; -} - -/* Smaller on mobile only */ -@media (width <= 666px) { - .header__site-name { - font-size: var(--fs-l); - } -} - -/* Logo scaling - smaller on mobile */ .header__logo-image { width: 50px; height: 50px; @@ -39,83 +191,90 @@ } } -/* Reserve space for the mobile menu without changing the theme's colours or fonts. */ -:root { - --mobile-bar-h: 3.25rem; +.header__site-name { + flex-shrink: 1; + min-width: 0; + margin-block: 0; } -.layout__page:has(> .mobile-nav:not([hidden])) { - padding-block-end: calc(var(--mobile-bar-h) + env(safe-area-inset-bottom, 0px)); +@media (width <= 666px) { + .header__site-name { + font-size: calc(var(--fs-l) * var(--display-scale)); + } } -:root:has(.mobile-nav:not([hidden])) { - scroll-padding-block-end: calc(var(--mobile-bar-h) + 1rem); +.header__site-link { + color: inherit; + + &:hover, + &:focus-visible { + text-decoration: underline; + } } -.mobile-nav { - position: fixed; - inset: 0; - width: auto; - height: auto; +/* Links in text keep their underline: the link colour alone is too close to the text colour. */ +nav a, +.header a { + text-decoration: none; } -.mobile-nav__cover { - inset: 0; - width: auto; - height: auto; -} - -.mobile-nav__toggle.button { - position: fixed; - inset: auto 0 0; - justify-content: center; - gap: 0.6rem; - width: auto; - block-size: calc(var(--mobile-bar-h) + env(safe-area-inset-bottom, 0px)); - padding: 0 var(--gutters) env(safe-area-inset-bottom, 0px); - border: 0; - border-radius: 0; - background: var(--color-button); +/* Main menu: quiet (outlined) chips, the current page and hover are filled green. */ +.main-menu a { + padding: 0.15rem 0.75rem; + background: transparent; + box-shadow: inset 0 0 0 1px currentcolor; + color: var(--color-text); + text-decoration: none; &:hover, &:focus-visible, - &:active { - background: var(--color-button-hover); + &[aria-current] { + background: var(--c40-green); box-shadow: none; - } - - &:focus-visible { - outline-offset: -4px; + color: var(--c40-on-fill); + text-decoration: none; } } -.mobile-nav__sheet { - position: absolute; - inset: auto 0 calc(var(--mobile-bar-h) + env(safe-area-inset-bottom, 0px)); - width: auto; - height: auto; - max-height: calc(100% - var(--mobile-bar-h) - env(safe-area-inset-bottom, 0px) - var(--spacing-l)); - overflow-y: auto; - padding: var(--spacing-m) var(--gutters); - transform: translateY(100%); - - [data-navopen] & { - transform: translateY(0); - } -} - -.mobile-nav__region .language-selector ul { - flex: 1; - flex-direction: column; -} - -.language-selector a { +/* Nav row (layouts/_partials/menu.html): menu chips, and the language switch on the right. */ +.nav-bar__row { display: flex; + flex-wrap: wrap; align-items: center; - gap: 0.45em; + gap: 0.5rem; } -.language-selector .language-icon { +.nav-bar .header__region { + margin-inline-start: auto; +} + +/* On small screens mobilemenu.js hides both parts; drop the then empty row too. */ +.nav-bar:has(.main-menu[hidden]) { + display: none; +} + +/* Language switch: 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.15rem 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; @@ -123,77 +282,131 @@ fill: currentcolor; } -.mobile-nav__region .language-selector { - font-size: inherit; +/* + * 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-nav__region .language-selector a, -.mobile-nav__navbar a { - padding-block: 0.5rem; +.mobile-bottom-nav__item + .mobile-bottom-nav__item { + border-inline-start: 2px solid var(--color-border); } -.mobile-nav__region .language-selector a { - justify-content: center; -} +.mobile-bottom-nav__link { + color: var(--color-text); -.mobile-nav__navbar a { - display: block; -} - -table, th, td { - border: 1px solid; + &[aria-current='page'] { + background: var(--c40-green); + color: var(--c40-on-fill); } -th, td { - padding: 3px 6px; - font-variant-numeric: tabular-nums; -} -.title-post-date { margin-left: 0em; - display: block; - font-size: 0.5em; -} + &[hreflang] { + background: var(--c40-amber); + color: var(--c40-on-fill); + } -/* Zen v7 paints body with --color-body-bg and .page with --color-page-bg. */ -:root { - --color-body-bg: light-dark(var(--color-grey-100), #141414); - --color-page-bg: light-dark(var(--color-white), #242424); -} + &:focus-visible { + background: var(--c40-green); + color: var(--c40-on-fill); + outline-color: var(--c40-on-fill); + outline-offset: -6px; + } -@media (prefers-color-scheme: dark) { - :root { - --color-headings: #faf5f5; - --color-header-bg: #242424; - --color-text: #faf5f5; - --color-link: #66f2ff; - --color-link-visited: #66f2ff; - --color-footer-bg: #242424; - --color-border: #faf5f5; - --color-button: #141414; - --color-button-text: #faf5f5; - --color-button-hover: #343434; - --color-brand: #66f2ff; - --color-text-meta: #faf5f5; - --color-mobile-menu: #141414; + /* Touch screens keep :hover after a tap. */ + @media (hover: hover) { + &:hover { + background: var(--c40-green); + color: var(--c40-on-fill); } - + } } -nav ul li { - flex-grow: 1; - text-align: center; -} -.main-menu a:active { - text-decoration: none; -} -/* Links in text keep their underline: the link colour alone is too close to the text colour. */ -nav a, -.header a { - text-decoration: none; +/* Keep focused and scrolled-to elements clear of the bar. */ +@media (width <= 666px) { + :root { + scroll-padding-block-end: 6rem; + } } -h2 a { - margin-right: 2em; +/* 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; diff --git a/assets/css/_fonts.css b/assets/css/_fonts.css new file mode 100644 index 0000000..504481b --- /dev/null +++ b/assets/css/_fonts.css @@ -0,0 +1,53 @@ +/* 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). */ + +@font-face { + font-family: 'Jersey 10'; + src: url('../fonts/Jersey10-latin-ext.woff2') 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: 'Jersey 10'; + src: url('../fonts/Jersey10-latin.woff2') 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: 'Hack'; + src: url('../fonts/Hack-Regular.woff2') format('woff2'); + font-weight: 400; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Hack'; + src: url('../fonts/Hack-Italic.woff2') format('woff2'); + font-weight: 400; + font-style: italic; + font-display: swap; +} + +@font-face { + font-family: 'Hack'; + src: url('../fonts/Hack-Bold.woff2') format('woff2'); + font-weight: 700; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Hack'; + src: url('../fonts/Hack-BoldItalic.woff2') format('woff2'); + font-weight: 700; + font-style: italic; + font-display: swap; +} diff --git a/assets/css/_schedule.css b/assets/css/_schedule.css index d91766b..d7ba128 100644 --- a/assets/css/_schedule.css +++ b/assets/css/_schedule.css @@ -3,7 +3,7 @@ .schedule { --schedule-line: color-mix(in oklch, var(--color-text) 20%, transparent); --schedule-card-bg: color-mix(in oklch, var(--color-text) 4%, transparent); - --schedule-accent: var(--color-link); + --schedule-accent: var(--c40-green); container-type: inline-size; margin-block: var(--spacing-l); @@ -84,7 +84,7 @@ margin: 0 0 0.75rem; padding-block-end: 0.35rem; border-block-end: 2px solid var(--schedule-accent); - font-size: var(--fs-l); + font-size: calc(var(--fs-l) * var(--display-scale)); } .schedule__date { @@ -170,7 +170,6 @@ .schedule__lang { padding: 0 0.4rem; border: 1px solid var(--schedule-line); - border-radius: 999px; font-family: var(--ff-alt); font-size: var(--fs-xs); letter-spacing: 0.03em; @@ -237,7 +236,7 @@ &[aria-pressed="true"] { background: var(--schedule-accent); - color: var(--color-body-bg); + color: var(--c40-on-fill); .schedule__pick-date { color: inherit; diff --git a/assets/fonts/Hack-Bold.woff2 b/assets/fonts/Hack-Bold.woff2 new file mode 100644 index 0000000..792a8e0 Binary files /dev/null and b/assets/fonts/Hack-Bold.woff2 differ diff --git a/assets/fonts/Hack-BoldItalic.woff2 b/assets/fonts/Hack-BoldItalic.woff2 new file mode 100644 index 0000000..60f2451 Binary files /dev/null and b/assets/fonts/Hack-BoldItalic.woff2 differ diff --git a/assets/fonts/Hack-Italic.woff2 b/assets/fonts/Hack-Italic.woff2 new file mode 100644 index 0000000..e16f0d2 Binary files /dev/null and b/assets/fonts/Hack-Italic.woff2 differ diff --git a/assets/fonts/Hack-Regular.woff2 b/assets/fonts/Hack-Regular.woff2 new file mode 100644 index 0000000..d41cc1c Binary files /dev/null and b/assets/fonts/Hack-Regular.woff2 differ diff --git a/assets/fonts/Jersey10-latin-ext.woff2 b/assets/fonts/Jersey10-latin-ext.woff2 new file mode 100644 index 0000000..43623ab Binary files /dev/null and b/assets/fonts/Jersey10-latin-ext.woff2 differ diff --git a/assets/fonts/Jersey10-latin.woff2 b/assets/fonts/Jersey10-latin.woff2 new file mode 100644 index 0000000..babec4e Binary files /dev/null and b/assets/fonts/Jersey10-latin.woff2 differ diff --git a/assets/img/40c3/logo-text-0.svg b/assets/img/40c3/logo-text-0.svg new file mode 100644 index 0000000..243635d --- /dev/null +++ b/assets/img/40c3/logo-text-0.svg @@ -0,0 +1,39 @@ + + \ No newline at end of file diff --git a/assets/img/40c3/logo-text-b.svg b/assets/img/40c3/logo-text-b.svg new file mode 100644 index 0000000..413d24d --- /dev/null +++ b/assets/img/40c3/logo-text-b.svg @@ -0,0 +1,39 @@ + + \ No newline at end of file diff --git a/content/de/_index.md b/content/de/_index.md index ed1c211..363f373 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/en/_index.md b/content/en/_index.md index 2dbe876..a87674d 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/hackertours_banner.webp.md b/hackertours_banner.webp.md new file mode 100644 index 0000000..cdd81bf --- /dev/null +++ b/hackertours_banner.webp.md @@ -0,0 +1,2 @@ +# hackertours_banner.webp + diff --git a/layouts/_partials/footer.html b/layouts/_partials/footer.html new file mode 100644 index 0000000..e39f339 --- /dev/null +++ b/layouts/_partials/footer.html @@ -0,0 +1,6 @@ +{{- /* Overrides the zen theme's footer.html. Same as the theme's, plus the 40C3 logo. */ -}} +{{ if $.Param "feedlinks" }}{{ partial "feedlinks.html" . }}{{ end -}} +
+{{ with site.Copyright }}{{ . | site.Home.RenderString }}{{ else }}© {{ site.Title }}{{ end }}
+{{ with $.Param "footer" }}{{ . | site.Home.RenderString }}
{{ end }} +{{ if $.Param "poweredby" }}Powered by Hugo and the Zen theme.
{{ end }} diff --git a/layouts/_partials/head/extra.html b/layouts/_partials/head/extra.html index bc6605d..9cab363 100644 --- a/layouts/_partials/head/extra.html +++ b/layouts/_partials/head/extra.html @@ -1,3 +1,6 @@ +{{- /* Browser UI colours, the same as the page backgrounds in assets/css/_custom.css. */ -}} + + {{- /* 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 diff --git a/layouts/_partials/logo-40c3.html b/layouts/_partials/logo-40c3.html new file mode 100644 index 0000000..f17a402 --- /dev/null +++ b/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" -}} +