diff --git a/.gitignore b/.gitignore index b0a48ff..1516e93 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ public resources/_gen -.DS_Store \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index df27575..dc19131 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,3 @@ [submodule "themes/zen"] path = themes/zen - url = https://git.hamburg.ccc.de/CCCHH/hackertours-theme.git - branch = hackertours-mobile-nav + url = https://github.com/frjo/hugo-theme-zen.git diff --git a/README.md b/README.md index b836837..476cd85 100644 --- a/README.md +++ b/README.md @@ -16,27 +16,6 @@ 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 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. The page reserves space for the bar so it does -not cover content. - -## Brand spelling check - -Hugo builds check content source lines for the name `Hackertours` in any other -casing and report the file and line as build errors for pages included in the -build. URLs, email addresses, social handles, Matrix room addresses and -Markdown link destinations are excluded. Commented-out content is checked too, -so it is ready to publish. - -For an intentional exception, add `` at the -end of a Markdown line, or `# hackertours-lint-ignore` at the end of a YAML -front matter line. This ignores that entire source line, so keep unrelated -occurrences on other lines. - ## Shortcode: Language badge Use the `lang` shortcode to mark whether a tour is in German, English or bilingual. It renders a small superscript badge next to the text, with details when hovered over or parsed by a screenreader. diff --git a/assets/css/_custom.css b/assets/css/_custom.css index a9759e9..04d3ab7 100644 --- a/assets/css/_custom.css +++ b/assets/css/_custom.css @@ -5,9 +5,7 @@ * 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: paper background and ink text, as on the 40C3 info pages - * (events.ccc.de/congress/2026/infos). Those pages also put black boxes behind links and give - * each heading level its own colour; this site doesn't, it sticks to the styleguide's chips. + * 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. @@ -24,8 +22,8 @@ --c40-paper: #ebedf0; --c40-ink: #001300; - --c40-light-bg: var(--c40-paper); - --c40-light-fg: var(--c40-ink); + --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)); @@ -78,6 +76,10 @@ --color-border-dark: var(--color-border); --color-mobile-menu: var(--color-body-bg); + --color-mobile-menu-cover: rgb(0 19 0 / 0.6); + + /* Height of the mobile menu bar at the bottom of the screen. */ + --mobile-bar-h: 3.25rem; --color-accent: var(--c40-green); --color-highlight: var(--c40-amber); @@ -129,14 +131,16 @@ mark { /* 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 { +h2, +.header__intro_headline { font-family: var(--ff-display); font-weight: 400; letter-spacing: 0; line-height: 1; } -h1 { +h1, +.header__intro_headline { width: fit-content; max-width: 100%; padding: 0.12em 0.3em 0.2em; @@ -157,8 +161,11 @@ h3 { text-underline-offset: 0.25em; } +h2 a { + margin-right: 2em; +} + .title-post-date { - display: block; margin-left: 0; color: var(--color-text-meta); font-family: var(--ff-body); @@ -166,70 +173,29 @@ h3 { 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. */ +/* Shared branding; inner pages keep their own main h1. */ .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)); - } +.header__intro_headline { + margin: 0 0 0.5rem; } .header__site-link { color: inherit; - - &:hover, - &:focus-visible { - 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; +.header__intro_text { + font-family: var(--ff-body); } -/* 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; +/* Main menu: quiet (outlined) chips, the current page and hover are filled green. */ +.main-menu a, +.mobile-nav__navbar a { + padding: 0.15rem 0.75rem; background: transparent; - box-shadow: inset 0 0 0 2px var(--color-border); + box-shadow: inset 0 0 0 1px currentcolor; color: var(--color-text); text-decoration: none; @@ -243,8 +209,24 @@ nav a, } } -/* Language switch, on the right of the header: an amber chip with the icon, so it doesn't read - as a menu entry. */ +/* 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.5rem; +} + +.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: a periwinkle chip with the icon, so it doesn't read as a menu entry. */ .language-selector { font-size: inherit; @@ -252,7 +234,7 @@ nav a, display: flex; align-items: center; gap: 0.45em; - padding: 0.3rem 0.75rem; + padding: 0.15rem 0.75rem; background: var(--c40-amber); color: var(--c40-on-fill); text-decoration: none; @@ -268,57 +250,119 @@ nav a, .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 menu (below 667px, switched on by the theme's mobilemenu.js): the toggle is a green + * bar fixed to the bottom of the screen. It opens a panel that slides up out of the bar, sized + * to its content so the language switch and the menu chips sit right above the bar. */ -.mobile-bottom-nav { +.layout__page:has(> .mobile-nav:not([hidden])) { + padding-block-end: calc(var(--mobile-bar-h) + env(safe-area-inset-bottom, 0px)); +} + +/* Keep focused and scrolled-to elements clear of the bar. */ +:root:has(.mobile-nav:not([hidden])) { + scroll-padding-block-end: calc(var(--mobile-bar-h) + 1rem); +} + +.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-block-start: 2px solid var(--color-border); -} + background: var(--c40-green); + color: var(--c40-on-fill); + font-family: var(--ff-display); + font-size: calc(var(--fs-l) * var(--display-scale)); + line-height: 1; -.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'] { + /* Touch screens keep :hover after a tap, so only the open state changes the colour. */ + &:hover, + &:focus-visible, + &:active { + border-color: var(--color-border); background: var(--c40-green); - color: var(--c40-on-fill); - } - - &[hreflang] { - background: var(--c40-amber); + box-shadow: none; 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. */ + &[aria-expanded='true'] { + background: var(--c40-amber); + } + @media (hover: hover) { &:hover { - background: var(--c40-green); - color: var(--c40-on-fill); + background: var(--c40-amber); } } } -/* Keep focused and scrolled-to elements clear of the bar. */ -@media (width <= 666px) { - :root { - scroll-padding-block-end: 6rem; +.mobile-nav__hamburger { + fill: currentcolor; +} + +/* The theme sizes the overlay with 100vw/100dvh, which don't match the screen when a mobile + browser zooms the page out. Size it from the screen edges instead, and anchor the panel to + the bar. */ +.mobile-nav { + position: fixed; + inset: 0; + width: auto; + height: auto; +} + +.mobile-nav__cover { + inset: 0; + width: auto; + height: auto; +} + +.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); + border-block-start: 2px solid var(--color-border); + /* Closed, it sits behind the bar. */ + transform: translateY(100%); + + [data-navopen] & { + box-shadow: none; + transform: translateY(0); + } +} + +.mobile-nav__region:not(:empty) { + margin-block-end: var(--spacing-m); +} + +.mobile-nav__region .language-selector ul { + flex: 1; + flex-direction: column; +} + +.mobile-nav__navbar { + gap: 0.5rem; + + a { + display: block; + padding: 0.5rem 0.75rem; } } diff --git a/assets/img/40c3/logo-text-b.svg b/assets/img/40c3/logo-text-b.svg index 925ec23..413d24d 100644 --- a/assets/img/40c3/logo-text-b.svg +++ b/assets/img/40c3/logo-text-b.svg @@ -3,7 +3,7 @@ diff --git a/content/de/_index.md b/content/de/_index.md index 378f538..c4a3f40 100644 --- a/content/de/_index.md +++ b/content/de/_index.md @@ -1,17 +1,11 @@ --- -title: Willkommen bei Hamburg Hackertours! +title: Hamburg Hackertours (de) menus: main: name: Home weight: 1 params: - headline: Willkommen bei Hamburg Hackertours! - intro: | - Für den Congress und für das Easterhegg organisiert der CCC Hamburg Touren zu interessanten Orten in und um Hamburg. - Hier findet ihr Informationen zu aktuellen und vergangenen Veranstaltungen! -cascade: - params: - intro: Wir von Hamburg Hackertours zeigen euch die Stadt! + intro: Wir von Hamburg Hackertours zeigen euch die Stadt! --- # 40C3 diff --git a/content/de/eh22/_index.md b/content/de/eh22/_index.md index 6c9b62f..503564d 100644 --- a/content/de/eh22/_index.md +++ b/content/de/eh22/_index.md @@ -9,7 +9,7 @@ cascade: showPostDate: false --- -**[Direkt zum Hackertours Ticket-Shop](https://tickets.hamburg.ccc.de/hackertours/eh22ht/)** +**[Direkt zum HackerTours Ticket-Shop](https://tickets.hamburg.ccc.de/hackertours/eh22ht/)** Diese Touren bieten wir zum [Easterhegg 2025](https://eh22.easterhegg.eu/start) an: diff --git a/content/de/faq/_index.md b/content/de/faq/_index.md index 41af9eb..76f6388 100644 --- a/content/de/faq/_index.md +++ b/content/de/faq/_index.md @@ -1,5 +1,5 @@ --- -title: '39C3 FAQ' +title: 'Die Hackertours für den 39C3 – FAQ' date: 2023-12-07T18:46:19+01:00 menus: main: diff --git a/content/de/posts/2024-12-04-old-elbe-tunnel-also-in-english.md b/content/de/posts/2024-12-04-old-elbe-tunnel-also-in-english.md index f39abc4..70181e1 100644 --- a/content/de/posts/2024-12-04-old-elbe-tunnel-also-in-english.md +++ b/content/de/posts/2024-12-04-old-elbe-tunnel-also-in-english.md @@ -8,6 +8,6 @@ tags: Schon gewusst? Die Tour [Alter Elbtunnel](../38c3/alter-elbtunnel/) gibt's auch in Englisch! - Datum: Tag 2 (28.12.) -- Treffen am Hackertours-Desk: 14:15 Uhr +- Treffen am HackerTours-Desk: 14:15 Uhr [Tickets](https://tickets.hamburg.ccc.de/hackertours/38c3/) diff --git a/content/de/posts/2024-12-17-last-chance-ticket-gaengeviertel.md b/content/de/posts/2024-12-17-last-chance-ticket-gaengeviertel.md index 2fae808..7de6ead 100644 --- a/content/de/posts/2024-12-17-last-chance-ticket-gaengeviertel.md +++ b/content/de/posts/2024-12-17-last-chance-ticket-gaengeviertel.md @@ -1,11 +1,11 @@ --- -title: '38c3: Letzte Chance für ein 38c3 Hackertours Gängeviertel Ticket!' +title: '38c3: Letzte Chance für ein 38c3 HackerTours Gängeviertel Ticket!' date: 2024-12-17T10:00:00+01:00 tags: - 38c3 --- -Update: Letzte Chance auf ein 38c3 Hackertours Gängeviertel Ticket! +Update: Letzte Chance auf ein 38c3 HackerTours Gängeviertel Ticket! Einmal Gängeviertel knackig, frisch und bunt! 11,00 EUR für große Portionen; halbe Portionen zahlen 6,00 EUR. diff --git a/content/de/posts/2024-12-17-last-chance-ticket-old-elbe-tunnel.md b/content/de/posts/2024-12-17-last-chance-ticket-old-elbe-tunnel.md index c2fe080..544052b 100644 --- a/content/de/posts/2024-12-17-last-chance-ticket-old-elbe-tunnel.md +++ b/content/de/posts/2024-12-17-last-chance-ticket-old-elbe-tunnel.md @@ -1,11 +1,11 @@ --- -title: '38c3: Letzte Chance für ein 38c3 Hackertours Alter Elbtunnel Ticket!' +title: '38c3: Letzte Chance für ein 38c3 HackerTours Alter Elbtunnel Ticket!' date: 2024-12-17T10:00:00+01:00 tags: - 38c3 --- -Update: Letzte Chance auf ein 38c3 Hackertours Alter Elbtunnel Ticket! +Update: Letzte Chance auf ein 38c3 HackerTours Alter Elbtunnel Ticket! Alter Elbtunnel, extra lange unter der Elbe gereift und aromatisch im Geschmack! 19 Goldtaler und du bist mit dabei! diff --git a/content/de/posts/2024-12-17-last-chance-ticket-stubnitz.md b/content/de/posts/2024-12-17-last-chance-ticket-stubnitz.md index 5bbe451..bf82835 100644 --- a/content/de/posts/2024-12-17-last-chance-ticket-stubnitz.md +++ b/content/de/posts/2024-12-17-last-chance-ticket-stubnitz.md @@ -1,11 +1,11 @@ --- -title: '38c3: Letzte Chance für ein 38c3 Hackertours MS Stubnitz Ticket!' +title: '38c3: Letzte Chance für ein 38c3 HackerTours MS Stubnitz Ticket!' date: 2024-12-17T10:00:00+01:00 tags: - 38c3 --- -Update: Letzte Chance für ein 38c3 Hackertours MS Stubnitz Ticket! +Update: Letzte Chance für ein 38c3 HackerTours MS Stubnitz Ticket! Einmal Stubnitz heiß und fettich, frisch aus der Ostsee! Nur 19,00 Euronen das Kilo! diff --git a/content/de/posts/2024-12-31-happy-new-year.md b/content/de/posts/2024-12-31-happy-new-year.md index 5c730c0..264a6eb 100644 --- a/content/de/posts/2024-12-31-happy-new-year.md +++ b/content/de/posts/2024-12-31-happy-new-year.md @@ -5,10 +5,10 @@ tags: - 38c3 --- -Leider ist der 38c3 schon wieder vorbei. Vielen Dank, dass ihr dabei wart! Wir hoffen, dass euch der 38c3 und die Hackertours-Touren gefallen haben. +Leider ist der 38c3 schon wieder vorbei. Vielen Dank, dass ihr dabei wart! Wir hoffen, dass euch der 38c3 und die HackerTours-Touren gefallen haben. -Auch 2025 werden wir wieder Hackertours-Touren für euch vermitteln. Alle Infos dazu folgen zu gegebener Zeit auf unserer Webseite und in unserem Mastodon-Kanal. +Auch 2025 werden wir wieder HackerTours-Touren für euch vermitteln. Alle Infos dazu folgen zu gegebener Zeit auf unserer Webseite und in unserem Mastodon-Kanal. Für das Neue Jahr wünschen wir euch alles Gute! -Euer Hackertours-Team \ No newline at end of file +Euer HackerTours-Team \ No newline at end of file diff --git a/content/de/posts/2025-02-14-eh22-coming-up.md b/content/de/posts/2025-02-14-eh22-coming-up.md index 071f33a..a517c23 100644 --- a/content/de/posts/2025-02-14-eh22-coming-up.md +++ b/content/de/posts/2025-02-14-eh22-coming-up.md @@ -7,4 +7,4 @@ tags: Wir haben die Vorbereitungen für das [EasterHegg 22](https://eh22.easterhegg.eu/start) fast abgeschlossen. Freut euch auf interessante Touren durch die schönste Stadt der Welt! -Euer Hackertours-Team \ No newline at end of file +Euer HackerTours-Team \ No newline at end of file diff --git a/content/de/posts/2025-04-10-eh-last-minute-tours.md b/content/de/posts/2025-04-10-eh-last-minute-tours.md index 86d6a9c..e1a560c 100644 --- a/content/de/posts/2025-04-10-eh-last-minute-tours.md +++ b/content/de/posts/2025-04-10-eh-last-minute-tours.md @@ -16,4 +16,4 @@ und zwar hier im [Ticket-Shop](https://tickets.hamburg.ccc.de/hackertours/eh22ht Wir freuen uns auf Euch! -Euer Hackertours Team \ No newline at end of file +Euer HackerTours Team \ No newline at end of file diff --git a/content/de/posts/2025-12-30-happy-2026.md b/content/de/posts/2025-12-30-happy-2026.md index 19ddeee..75fbc58 100644 --- a/content/de/posts/2025-12-30-happy-2026.md +++ b/content/de/posts/2025-12-30-happy-2026.md @@ -10,4 +10,4 @@ Das war ein schöner Congress, und wir hoffen, euch hat es ebensoviel Spaß gema Für das Neue Jahr wünschen wir euch alles Gute! -Euer Hackertours-Team \ No newline at end of file +Euer HackerTours-Team \ No newline at end of file diff --git a/content/de/posts/2026-11-03-40c3-coming.md b/content/de/posts/2026-11-03-40c3-coming.md index 4673a92..4470765 100644 --- a/content/de/posts/2026-11-03-40c3-coming.md +++ b/content/de/posts/2026-11-03-40c3-coming.md @@ -10,4 +10,4 @@ Noch sind wir dabei, die letzten Sachen zu organisieren und alles klar zu machen Wir haben vor, den Ticketshop am Sonntag, den 22.11. zu öffnen. Wenn ihr schnell zuschlagen wollt, notiert euch also gerne schon mal den Termin. -Euer Hackertours-Team \ No newline at end of file +Euer HackerTours-Team \ No newline at end of file diff --git a/content/en/_index.md b/content/en/_index.md index 407411f..955f386 100644 --- a/content/en/_index.md +++ b/content/en/_index.md @@ -1,17 +1,11 @@ --- -title: Welcome to Hamburg Hackertours! +title: Hamburg Hackertours (en) menus: main: name: Home weight: 1 params: - headline: Welcome to Hackertours! - intro: | - For Congress and for Easterhegg CCC Hamburg is organizing tours to interesting places in and around Hamburg. - Here you will find information about current and past events! -cascade: - params: - intro: We at Hamburg Hackertours show you around the city! + intro: We at Hamburg Hackertours show you around the city! --- # 40C3 diff --git a/content/en/eh22/_index.md b/content/en/eh22/_index.md index 715b572..d80b6e6 100644 --- a/content/en/eh22/_index.md +++ b/content/en/eh22/_index.md @@ -9,7 +9,7 @@ cascade: showPostDate: false --- -**[Directly to the Hackertours ticket shop](https://tickets.hamburg.ccc.de/hackertours/eh22ht/)** +**[Directly to the HackerTours ticket shop](https://tickets.hamburg.ccc.de/hackertours/eh22ht/)** We are offering these tours for [Easterhegg 2025](https://eh22.easterhegg.eu/start): diff --git a/content/en/faq/_index.md b/content/en/faq/_index.md index 33ce3ec..413c178 100644 --- a/content/en/faq/_index.md +++ b/content/en/faq/_index.md @@ -1,5 +1,5 @@ --- -title: 39C3 FAQ +title: Hackertours for 39C3 – FAQ date: 2023-12-07T18:46:19+01:00 menus: main: diff --git a/content/en/posts/2023-12-25-payment-waiting-list.md b/content/en/posts/2023-12-25-payment-waiting-list.md index 049363e..267c660 100644 --- a/content/en/posts/2023-12-25-payment-waiting-list.md +++ b/content/en/posts/2023-12-25-payment-waiting-list.md @@ -2,14 +2,14 @@ title: '37c3: Cash payment and last-minute seats' date: 2023-12-25T09:00:00+01:00 summary: | - tl;dr: please pay your tickets at the Hackertours desk. Any left over seats will be assigned at the beginning of each tour. + tl;dr: please pay your tickets at the hackertours desk. Any left over seats will be assigned at the beginning of each tour. --- -**tl;dr:** please pay your tickets at the Hackertours desk. Any left over places will be assigned at the beginning of each tour. +**tl;dr:** please pay your tickets at the hackertours desk. Any left over places will be assigned at the beginning of each tour. ## Cash payment: before the tour starts at the latest -If you have chosen **cash payment**, please come to the Hackertours desk **no later than the start time of your tour** and pay for your tickets. **Otherwise, we will reassign them**. +If you have chosen **cash payment**, please come to the hackertours desk **no later than the start time of your tour** and pay for your tickets. **Otherwise, we will reassign them**. If oyu have paid already by bank transfer, just come to the desk at the published start time. diff --git a/content/en/posts/2024-12-04-old-elbe-tunnel-also-in-english.md b/content/en/posts/2024-12-04-old-elbe-tunnel-also-in-english.md index 11f144c..b0d4cb6 100644 --- a/content/en/posts/2024-12-04-old-elbe-tunnel-also-in-english.md +++ b/content/en/posts/2024-12-04-old-elbe-tunnel-also-in-english.md @@ -8,6 +8,6 @@ tags: Did you know that...? The tour [Old Elbe Tunnel](../38c3/alter-elbtunnel/) is also available in English! - date: Day 2 (28 December) -- Meeting time at the Hackertours Desk: 14:15 +- Meeting time at the HackerTours Desk: 14:15 [Tickets](https://tickets.hamburg.ccc.de/hackertours/38c3/) diff --git a/content/en/posts/2024-12-17-last-chance-ticket-gaengeviertel.md b/content/en/posts/2024-12-17-last-chance-ticket-gaengeviertel.md index c830822..eca084d 100644 --- a/content/en/posts/2024-12-17-last-chance-ticket-gaengeviertel.md +++ b/content/en/posts/2024-12-17-last-chance-ticket-gaengeviertel.md @@ -1,11 +1,11 @@ --- -title: '38c3: Last chance for a 38c3 Hackertours Gängeviertel ticket!' +title: '38c3: Last chance for a 38c3 HackerTours Gängeviertel ticket!' date: 2024-12-17T10:00:00+01:00 tags: - 38c3 --- -Update: Last chance for a 38c3 Hackertours Gängeviertel ticket! +Update: Last chance for a 38c3 HackerTours Gängeviertel ticket! Gängeviertel (German for: “alleyway district”) crispy, fresh and colorful! 11,00 EUR for large portions; half portions pay 6,00 EUR. diff --git a/content/en/posts/2024-12-17-last-chance-ticket-old-elbe-tunnel.md b/content/en/posts/2024-12-17-last-chance-ticket-old-elbe-tunnel.md index ab2a897..eb86e18 100644 --- a/content/en/posts/2024-12-17-last-chance-ticket-old-elbe-tunnel.md +++ b/content/en/posts/2024-12-17-last-chance-ticket-old-elbe-tunnel.md @@ -1,11 +1,11 @@ --- -title: '38c3: Last chance for a 38c3 Hackertours Old Elbe tunnel ticket!' +title: '38c3: Last chance for a 38c3 HackerTours Old Elbe tunnel ticket!' date: 2024-12-17T10:00:00+01:00 tags: - 38c3 --- -Update: Last chance for a 38c3 Hackertours Old Elbe tunnel ticket! +Update: Last chance for a 38c3 HackerTours Old Elbe tunnel ticket! Old Elbe tunnel, extra long matured under the Elbe and aromatic in taste! 19 gold taler and you’re in! diff --git a/content/en/posts/2024-12-17-last-chance-ticket-stubnitz.md b/content/en/posts/2024-12-17-last-chance-ticket-stubnitz.md index 99481ce..2ec158a 100644 --- a/content/en/posts/2024-12-17-last-chance-ticket-stubnitz.md +++ b/content/en/posts/2024-12-17-last-chance-ticket-stubnitz.md @@ -1,11 +1,11 @@ --- -title: '38c3: Last chance for a 38c3 Hackertours MS Stubnitz ticket!' +title: '38c3: Last chance for a 38c3 HackerTours MS Stubnitz ticket!' date: 2024-12-17T10:00:00+01:00 tags: - 38c3 --- -Update: Last chance for a 38c3 Hackertours MS Stubnitz ticket! +Update: Last chance for a 38c3 HackerTours MS Stubnitz ticket! Stubnitz hot and oily, fresh from the Baltic Sea! Only € 19.00 per kilo! diff --git a/content/en/posts/2024-12-31-happy-new-year.md b/content/en/posts/2024-12-31-happy-new-year.md index b3fc4d0..2cbf7b2 100644 --- a/content/en/posts/2024-12-31-happy-new-year.md +++ b/content/en/posts/2024-12-31-happy-new-year.md @@ -5,10 +5,10 @@ tags: - 38c3 --- -Unfortunately, the 38c3 is already over again. Thank you for coming! We hope you enjoyed the 38c3 and the Hackertours tours. +Unfortunately, the 38c3 is already over again. Thank you for coming! We hope you enjoyed the 38c3 and the HackerTours tours. -In 2025, we will again negotiate Hackertours tours for you. All information about this will follow on our website and in our Mastodon channel in due time. +In 2025, we will again negotiate HackerTours tours for you. All information about this will follow on our website and in our Mastodon channel in due time. We wish you all the best for the New Year! -Your Hackertours team \ No newline at end of file +Your HackerTours team \ No newline at end of file diff --git a/content/en/posts/2025-02-14-eh22-coming-up.md b/content/en/posts/2025-02-14-eh22-coming-up.md index 75292b3..c56d1a8 100644 --- a/content/en/posts/2025-02-14-eh22-coming-up.md +++ b/content/en/posts/2025-02-14-eh22-coming-up.md @@ -7,4 +7,4 @@ tags: We're almost done preparing for [EasterHegg 22](https://eh22.easterhegg.eu/en:start). Get excited about nice tours in the most beautiful city in the world! -Your Hackertours Team \ No newline at end of file +Your HackerTours Team \ No newline at end of file diff --git a/content/en/posts/2025-04-10-eh-last-minute-tours.md b/content/en/posts/2025-04-10-eh-last-minute-tours.md index 6707ac9..34de6e6 100644 --- a/content/en/posts/2025-04-10-eh-last-minute-tours.md +++ b/content/en/posts/2025-04-10-eh-last-minute-tours.md @@ -1,11 +1,11 @@ --- -title: 'EH22: Last Minute Hackertours' +title: 'EH22: Last Minute HackerTours' date: 2025-04-10T10:00:00+01:00 tags: - eh22 --- -Update: There are still places available for some of the Hackertours: +Update: There are still places available for some of the HackerTours: * [Kampnagel](https://hackertours.hamburg.ccc.de/en/eh22/kampnagel/) * [Alternative Hafenrundfahrt](https://hackertours.hamburg.ccc.de/en/eh22/hafenrundfahrt/) @@ -16,4 +16,4 @@ here in the [ticket shop](https://tickets.hamburg.ccc.de/hackertours/eh22ht/)! We look forward to meeting you! -Your Hackertours team \ No newline at end of file +Your HackerTours team \ No newline at end of file diff --git a/content/en/posts/2025-12-30-happy-2026.md b/content/en/posts/2025-12-30-happy-2026.md index a1a3adb..211cb39 100644 --- a/content/en/posts/2025-12-30-happy-2026.md +++ b/content/en/posts/2025-12-30-happy-2026.md @@ -10,4 +10,4 @@ This was a very nice Congress and we hope you enjoyed it as much as we did! In t We wish you all the best for the New Year! -Your Hackertours team \ No newline at end of file +Your HackerTours team \ No newline at end of file diff --git a/content/en/posts/2026-11-03-40c3-coming.md b/content/en/posts/2026-11-03-40c3-coming.md index b943285..34183bc 100644 --- a/content/en/posts/2026-11-03-40c3-coming.md +++ b/content/en/posts/2026-11-03-40c3-coming.md @@ -10,4 +10,4 @@ We're still busy organizing the last few things and getting everything sorted, b We plan to open the ticket shop on Sunday, November 22. If you want to be quick, go ahead and mark the date in your calendar. -Your Hackertours team +Your HackerTours team diff --git a/data/lucideicons.json b/data/lucideicons.json deleted file mode 100644 index ff446d1..0000000 --- a/data/lucideicons.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "house": "", - "rss": "", - "calendar": "", - "circle-question-mark": "", - "languages": "" -} \ No newline at end of file diff --git a/layouts/_partials/head/extra.html b/layouts/_partials/head/extra.html index ee579c3..adaaad1 100644 --- a/layouts/_partials/head/extra.html +++ b/layouts/_partials/head/extra.html @@ -1,5 +1,5 @@ {{- /* 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 @@ -51,4 +51,3 @@ og:image:alt. {{- end -}} {{- end -}} {{- end -}} - diff --git a/layouts/_partials/icon.html b/layouts/_partials/icon.html deleted file mode 100644 index 6329e76..0000000 --- a/layouts/_partials/icon.html +++ /dev/null @@ -1,12 +0,0 @@ -{{- /* -Render a Lucide icon from the local icons data file. -Usage: {{ partial "icon" "house" }} -Icons are fetched from data/lucideicons.json at build time -*/ -}} -{{- $iconName := . -}} -{{- with index hugo.Data.lucideicons $iconName -}} - {{- . | safeHTML -}} -{{- else -}} - {{- /* Fallback if icon not found */ -}} - -{{- end -}} diff --git a/layouts/_partials/language-selector-inline.html b/layouts/_partials/language-selector-inline.html deleted file mode 100644 index 3a6b0b6..0000000 --- a/layouts/_partials/language-selector-inline.html +++ /dev/null @@ -1,14 +0,0 @@ -{{- /* Inline language selector for mobile bottom nav */ -}} - diff --git a/layouts/_partials/language-selector.html b/layouts/_partials/language-selector.html index a577641..08d3693 100644 --- a/layouts/_partials/language-selector.html +++ b/layouts/_partials/language-selector.html @@ -1,6 +1,6 @@ -{{- /* Keep the translation icon inside the link so the entire language row is clickable. -Compare with the theme's language-selector.html after updating Zen. */ -}} -{{- $icon := ` diff --git a/layouts/_partials/mobilemenu.html b/layouts/_partials/mobilemenu.html index e77bced..626b795 100644 --- a/layouts/_partials/mobilemenu.html +++ b/layouts/_partials/mobilemenu.html @@ -1,38 +1,22 @@ - + + diff --git a/layouts/baseof.html b/layouts/baseof.html index c735616..1014e6e 100644 --- a/layouts/baseof.html +++ b/layouts/baseof.html @@ -1,4 +1,3 @@ -{{ partial "lint-brand.html" . }} @@ -21,22 +20,26 @@
+{{ $home := site.Home -}}
-{{ if $.Param "logo" | default true -}} - {{ end -}} -

-{{ site.Title }} -

-
-{{ if hugo.IsMultilingual }}{{ partial "language-selector.html" . }}{{ end -}} -{{ if $.Param "menuinheader" }}{{ partial "menu.html" . }}{{ end -}} +
+ {{ if .IsHome }} +

{{ site.Title }}

+ {{ else }} + + {{ end }} + {{ with $home.Param "intro" }} +
{{ . }}
+ {{ end }}
-{{ if not ($.Param "menuinheader") }}{{ partial "menu.html" . }}{{ end -}} +{{ partial "menu.html" . }} {{ if $.Param "mobilemenu" }}{{ partial "mobilemenu.html" . }}{{ end -}}
diff --git a/layouts/home-baseof.html b/layouts/home-baseof.html deleted file mode 100644 index c735616..0000000 --- a/layouts/home-baseof.html +++ /dev/null @@ -1,54 +0,0 @@ -{{ partial "lint-brand.html" . }} - - - - - -{{ block "title" . }}{{ .Title }} – {{ site.Title }}{{ end }} -{{ partial "head/meta.html" . }} -{{ partialCached "head/favicons.html" . }} -{{ partialCached "head/styles.html" . }} -{{ partial "head/meta-json-ld.html" . }} -{{ partial "head/scripts.html" . }} -{{ partial "head/math.html" . }} -{{ partialCached "head/tracking.html" . }} -{{ partial "head/extra.html" . }} -{{ block "head" . }}{{ end }} -{{ if .HasShortcode "schedule" }}{{ partial "schedule-script.html" . }}{{ end }} -{{ if .HasShortcode "gallery" }}{{ partial "gallery-script.html" . }}{{ end }} - - - - -
-
-{{ if $.Param "logo" | default true -}} - -{{ end -}} -

-{{ site.Title }} -

-
-{{ if hugo.IsMultilingual }}{{ partial "language-selector.html" . }}{{ end -}} -{{ if $.Param "menuinheader" }}{{ partial "menu.html" . }}{{ end -}} -
-
- -{{ if not ($.Param "menuinheader") }}{{ partial "menu.html" . }}{{ end -}} -{{ if $.Param "mobilemenu" }}{{ partial "mobilemenu.html" . }}{{ end -}} - -
-{{ block "main" . }}{{ end }} - -{{ if $.Param "sidebar" }}{{ partial "sidebar.html" . }}{{ end -}} - -
-{{ partial "footer.html" . }} -
- -{{ if $.Param "cookieconsent" }}{{ partialCached "cookieconsent.html" . }}{{ end -}} -
- - diff --git a/layouts/home.html b/layouts/home.html index 5513a14..ec93d88 100644 --- a/layouts/home.html +++ b/layouts/home.html @@ -2,13 +2,6 @@ {{ define "main" -}}
-
-

{{ .Title }}

-
-{{ if .Param "intro" }} -
{{ .Param "intro" }}
-{{ end }} - {{ .Content }} {{ $pages := .Site.RegularPages.RelatedTo (keyVals "tags" "current-event") -}} diff --git a/static/icons/lucide/calendar.svg b/static/icons/lucide/calendar.svg deleted file mode 100644 index 4679497..0000000 --- a/static/icons/lucide/calendar.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - diff --git a/static/icons/lucide/circle-question-mark.svg b/static/icons/lucide/circle-question-mark.svg deleted file mode 100644 index cf7e6ef..0000000 --- a/static/icons/lucide/circle-question-mark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/static/icons/lucide/house.svg b/static/icons/lucide/house.svg deleted file mode 100644 index 10e4097..0000000 --- a/static/icons/lucide/house.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/static/icons/lucide/languages.svg b/static/icons/lucide/languages.svg deleted file mode 100644 index c3c1486..0000000 --- a/static/icons/lucide/languages.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - diff --git a/static/icons/lucide/newspaper.svg b/static/icons/lucide/newspaper.svg deleted file mode 100644 index faf0fb5..0000000 --- a/static/icons/lucide/newspaper.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - diff --git a/static/site.webmanifest b/static/site.webmanifest index 485596a..a954211 100644 --- a/static/site.webmanifest +++ b/static/site.webmanifest @@ -15,7 +15,7 @@ "purpose": "maskable" } ], - "theme_color": "#ebedf0", - "background_color": "#ebedf0", + "theme_color": "#e2eed6", + "background_color": "#e2eed6", "display": "standalone" } \ No newline at end of file diff --git a/tests/test_brand_lint.py b/tests/test_brand_lint.py deleted file mode 100644 index bbb3a54..0000000 --- a/tests/test_brand_lint.py +++ /dev/null @@ -1,64 +0,0 @@ -import shutil -import subprocess -import tempfile -import unittest -from pathlib import Path - - -ROOT = Path(__file__).resolve().parents[1] - - -class BrandLintTest(unittest.TestCase): - def build(self, source): - with tempfile.TemporaryDirectory() as directory: - root = Path(directory) - (root / "content").mkdir() - (root / "layouts" / "_partials").mkdir(parents=True) - (root / "hugo.toml").write_text('baseURL = "https://example.org/"\n') - (root / "content" / "_index.md").write_text(source) - (root / "layouts" / "home.html").write_text( - '{{ partial "lint-brand.html" . }}{{ .Content }}' - ) - shutil.copy( - ROOT / "layouts" / "_partials" / "lint-brand.html", - root / "layouts" / "_partials" / "lint-brand.html", - ) - return subprocess.run( - ["hugo", "--source", str(root)], - capture_output=True, - text=True, - check=False, - ) - - def test_errors_include_spelling_and_source_line(self): - result = self.build("---\ntitle: Hackertours\n---\nHACKERTOURS and hackertours\n") - self.assertNotEqual(result.returncode, 0) - for line, spelling in [(2, "Hackertours"), (4, "HACKERTOURS"), (4, "hackertours")]: - self.assertIn(f':{line}: "{spelling}" should be "Hackertours"', result.stderr) - - def test_valid_names_identifiers_and_explicit_exceptions(self): - result = self.build( - "---\n" - "title: Hackertours # hackertours-lint-ignore\n" - "---\n" - "Hackertours\n" - "Hackertours \n" - "[Shop](https://hackertours.example/hackertours) " - "ticket@hackertours.example @hackertours " - "#easterhegg-hackertours:example.org\n" - ) - self.assertEqual(result.returncode, 0, result.stderr) - - def test_marker_only_ignores_its_own_line(self): - result = self.build( - "---\ntitle: Hackertours\n---\n" - "Hackertours \n" - "Hackertours\n" - ) - self.assertNotEqual(result.returncode, 0) - self.assertIn(':5: "Hackertours" should be "Hackertours"', result.stderr) - self.assertNotIn(':4: "Hackertours" should be "Hackertours"', result.stderr) - - -if __name__ == "__main__": - unittest.main() diff --git a/themes/zen b/themes/zen index f5eaa82..6d4ee82 160000 --- a/themes/zen +++ b/themes/zen @@ -1 +1 @@ -Subproject commit f5eaa82f7dce4d7d25b7c4e9f7c56a356c1d82a2 +Subproject commit 6d4ee822a88a3dbe2443b2c985523e376f47056f