diff --git a/.gitignore b/.gitignore index 1516e93..b0a48ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ public resources/_gen +.DS_Store \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index dc19131..df27575 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "themes/zen"] path = themes/zen - url = https://github.com/frjo/hugo-theme-zen.git + url = https://git.hamburg.ccc.de/CCCHH/hackertours-theme.git + branch = hackertours-mobile-nav diff --git a/README.md b/README.md index 476cd85..b836837 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,27 @@ 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 04fd621..a9759e9 100644 --- a/assets/css/_custom.css +++ b/assets/css/_custom.css @@ -1,71 +1,403 @@ @import './_schedule.css'; @import './_gallery.css'; -.header__intro_headline { - margin: 0; - font: bold var(--fs-xxl) "Arial"; - padding-bottom: 10px; -} -.header__intro_text { - font-family: var(--ff-body) -} -table, th, td { - border: 1px solid; - } -th, td { - padding: 3px 6px; - font-variant-numeric: tabular-nums; -} - -.title-post-date { - font-size: .7em; - margin-left: 2em; -} - -/* Zen v7 paints body with --color-body-bg and .page with --color-page-bg. */ +/* + * 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. + * 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 { - --color-body-bg: light-dark(var(--color-grey-100), #141414); - --color-page-bg: light-dark(var(--color-white), #242424); + --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: 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; + + --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)); } -@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; - } - - 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; - } +:focus-visible { + outline: 3px solid var(--color-focus); + outline-offset: 2px; } -h2 a { - margin-right: 2em; +/* 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 { - margin-left: 0em; + 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__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__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; +} + +/* 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; 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..925ec23 --- /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 6deb6c3..378f538 100644 --- a/content/de/_index.md +++ b/content/de/_index.md @@ -1,5 +1,5 @@ --- -title: Hamburg Hackertours (de) +title: Willkommen bei Hamburg Hackertours! menus: main: name: Home @@ -7,28 +7,17 @@ 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! - logowidth: 500 - logoheight: 500 + 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! --- +# 40C3 + Wir bereiten Touren für den [40C3](https://events.ccc.de/category/40c3/) vor. In Kürze mehr! - - ![Hamburger Hacker Ausflüge am CCC. CC0 Amzi](hackertours_banner.webp) Frühere Veranstaltungen: [37C3](37c3) / [38C3](38c3) / [EH22](eh22) / [39C3](39c3) diff --git a/content/de/eh22/_index.md b/content/de/eh22/_index.md index 503564d..6c9b62f 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 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/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 70181e1..f39abc4 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 7de6ead..2fae808 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 544052b..c2fe080 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 bf82835..5bbe451 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 264a6eb..5c730c0 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 a517c23..071f33a 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 e1a560c..86d6a9c 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 75fbc58..19ddeee 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 4470765..4673a92 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 4004062..407411f 100644 --- a/content/en/_index.md +++ b/content/en/_index.md @@ -1,5 +1,5 @@ --- -title: Hamburg Hackertours (en) +title: Welcome to Hamburg Hackertours! menus: main: name: Home @@ -7,27 +7,17 @@ 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! - logowidth: 500 - logoheight: 500 + 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! --- +# 40C3 + We are preparing tours for [40C3](https://events.ccc.de/category/40c3/). Stay tuned! - ![Hamburger Hacker Ausflüge am CCC. CC0 Amzi](hackertours_banner.webp) Previous events: [37C3](37c3) / [38C3](38c3) / [EH22](eh22) / [39C3](39c3) diff --git a/content/en/eh22/_index.md b/content/en/eh22/_index.md index d80b6e6..715b572 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 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/content/en/posts/2023-12-25-payment-waiting-list.md b/content/en/posts/2023-12-25-payment-waiting-list.md index 267c660..049363e 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 b0d4cb6..11f144c 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 eca084d..c830822 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 eb86e18..ab2a897 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 2ec158a..99481ce 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 2cbf7b2..b3fc4d0 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 c56d1a8..75292b3 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 34de6e6..6707ac9 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 211cb39..a1a3adb 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 34183bc..b943285 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 new file mode 100644 index 0000000..ff446d1 --- /dev/null +++ b/data/lucideicons.json @@ -0,0 +1,7 @@ +{ + "house": "", + "rss": "", + "calendar": "", + "circle-question-mark": "", + "languages": "" +} \ No newline at end of file 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 9bc15d9..ee579c3 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 @@ -48,3 +51,4 @@ og:image:alt. {{- end -}} {{- end -}} {{- end -}} + diff --git a/layouts/_partials/icon.html b/layouts/_partials/icon.html new file mode 100644 index 0000000..6329e76 --- /dev/null +++ b/layouts/_partials/icon.html @@ -0,0 +1,12 @@ +{{- /* +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 new file mode 100644 index 0000000..3a6b0b6 --- /dev/null +++ b/layouts/_partials/language-selector-inline.html @@ -0,0 +1,14 @@ +{{- /* Inline language selector for mobile bottom nav */ -}} + diff --git a/layouts/_partials/language-selector.html b/layouts/_partials/language-selector.html new file mode 100644 index 0000000..a577641 --- /dev/null +++ b/layouts/_partials/language-selector.html @@ -0,0 +1,21 @@ +{{- /* 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/lint-brand.html b/layouts/_partials/lint-brand.html new file mode 100644 index 0000000..03f454e --- /dev/null +++ b/layouts/_partials/lint-brand.html @@ -0,0 +1,15 @@ +{{- with .File -}} + {{- $file := . -}} + {{- $source := readFile .Filename -}} + {{- range $index, $line := split $source "\n" -}} + {{- if not (findRE `(?:#\s*hackertours-lint-ignore|)\s*$` $line) -}} + {{- $text := replaceRE `\]\([^)]*\)` "]" $line -}} + {{- $text = replaceRE `(?i)(?:https?://|mailto:|www\.)[^\s<>"']+|[[:alnum:]._%+-]+@[[:alnum:]._-]+|@[[:alnum:]_]+|#[[:alnum:]_-]+:[[:alnum:]._-]+` "" $text -}} + {{- range findRE `(?i)\bhackertours\b` $text -}} + {{- if ne . "Hackertours" -}} + {{- errorf "%s:%d: %q should be \"Hackertours\" (different casing) - to ignore this, add a hackertours-lint-ignore comment on this line" $file.Filename (add $index 1) . -}} + {{- end -}} + {{- end -}} + {{- end -}} + {{- end -}} +{{- end -}} 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" -}} + + +40C3 MODEL_CITIZENS + diff --git a/layouts/_partials/mobilemenu.html b/layouts/_partials/mobilemenu.html index af2cf49..e77bced 100644 --- a/layouts/_partials/mobilemenu.html +++ b/layouts/_partials/mobilemenu.html @@ -1,22 +1,38 @@ - + {{ if hugo.IsMultilingual }} +
  • + {{ if eq .Lang "en" }} + + {{ partial "icon" "languages" }} + Deutsch + + {{ else }} + + {{ partial "icon" "languages" }} + English + + {{ end }} +
  • + {{ end }} + + diff --git a/layouts/_shortcodes/logo-40c3.html b/layouts/_shortcodes/logo-40c3.html new file mode 100644 index 0000000..a190699 --- /dev/null +++ b/layouts/_shortcodes/logo-40c3.html @@ -0,0 +1 @@ +{{- partial "logo-40c3.html" (dict "class" "event-logo") -}} diff --git a/layouts/baseof.html b/layouts/baseof.html index cf52f12..c735616 100644 --- a/layouts/baseof.html +++ b/layouts/baseof.html @@ -1,3 +1,4 @@ +{{ partial "lint-brand.html" . }} @@ -26,10 +27,9 @@ {{ i18n {{ end -}} -
    - -
    {{ .Param "intro" }}
    -
    +

    +{{ site.Title }} +

    {{ if hugo.IsMultilingual }}{{ partial "language-selector.html" . }}{{ end -}} {{ if $.Param "menuinheader" }}{{ partial "menu.html" . }}{{ end -}} diff --git a/layouts/home-baseof.html b/layouts/home-baseof.html index 8b591e8..c735616 100644 --- a/layouts/home-baseof.html +++ b/layouts/home-baseof.html @@ -1,3 +1,4 @@ +{{ partial "lint-brand.html" . }} @@ -26,12 +27,9 @@ {{ i18n {{ end -}} -
    -

    {{ .Param "headline" }}

    - {{ if .Param "intro" }} -
    {{ .Param "intro" }}
    - {{ end }} -
    +

    +{{ site.Title }} +

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

    {{ .Title }}

    +
    +{{ if .Param "intro" }} +
    {{ .Param "intro" }}
    +{{ end }} + {{ .Content }} {{ $pages := .Site.RegularPages.RelatedTo (keyVals "tags" "current-event") -}} diff --git a/static/fonts/Hack_License.txt b/static/fonts/Hack_License.txt new file mode 100644 index 0000000..f0c31d6 --- /dev/null +++ b/static/fonts/Hack_License.txt @@ -0,0 +1,31 @@ +The work in the Hack project is Copyright 2018 Source Foundry Authors and licensed under the MIT License + +The work in the DejaVu project was committed to the public domain. + +Bitstream Vera Sans Mono Copyright 2003 Bitstream Inc. and licensed under the Bitstream Vera License with Reserved Font Names "Bitstream" and "Vera" +MIT License + +Copyright (c) 2018 Source Foundry Authors + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +BITSTREAM VERA LICENSE + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: + +The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words "Bitstream" or the word "Vera". + +This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the "Bitstream Vera" names. + +The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. + +Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. \ No newline at end of file diff --git a/static/fonts/jersey-10_License.txt b/static/fonts/jersey-10_License.txt new file mode 100644 index 0000000..0a6f11a --- /dev/null +++ b/static/fonts/jersey-10_License.txt @@ -0,0 +1,43 @@ +SIL OPEN FONT LICENSE + +Version 1.1 - 26 February 2007 + +PREAMBLE + +The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives. + +DEFINITIONS + +"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the copyright statement(s). + +"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, or substituting — in part or in whole — any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS + +Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission. + +5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software. + +TERMINATION + +This license becomes null and void if any of the above conditions are not met. + +DISCLAIMER + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. \ No newline at end of file diff --git a/static/icons/lucide/calendar.svg b/static/icons/lucide/calendar.svg new file mode 100644 index 0000000..4679497 --- /dev/null +++ b/static/icons/lucide/calendar.svg @@ -0,0 +1,16 @@ + + + + + + diff --git a/static/icons/lucide/circle-question-mark.svg b/static/icons/lucide/circle-question-mark.svg new file mode 100644 index 0000000..cf7e6ef --- /dev/null +++ b/static/icons/lucide/circle-question-mark.svg @@ -0,0 +1,15 @@ + + + + + diff --git a/static/icons/lucide/house.svg b/static/icons/lucide/house.svg new file mode 100644 index 0000000..10e4097 --- /dev/null +++ b/static/icons/lucide/house.svg @@ -0,0 +1,14 @@ + + + + diff --git a/static/icons/lucide/languages.svg b/static/icons/lucide/languages.svg new file mode 100644 index 0000000..c3c1486 --- /dev/null +++ b/static/icons/lucide/languages.svg @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/static/icons/lucide/newspaper.svg b/static/icons/lucide/newspaper.svg new file mode 100644 index 0000000..faf0fb5 --- /dev/null +++ b/static/icons/lucide/newspaper.svg @@ -0,0 +1,16 @@ + + + + + + diff --git a/static/site.webmanifest b/static/site.webmanifest index ead2b68..485596a 100644 --- a/static/site.webmanifest +++ b/static/site.webmanifest @@ -15,7 +15,7 @@ "purpose": "maskable" } ], - "theme_color": "#ffffff", - "background_color": "#ffffff", + "theme_color": "#ebedf0", + "background_color": "#ebedf0", "display": "standalone" } \ No newline at end of file diff --git a/tests/test_brand_lint.py b/tests/test_brand_lint.py new file mode 100644 index 0000000..bbb3a54 --- /dev/null +++ b/tests/test_brand_lint.py @@ -0,0 +1,64 @@ +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 6d4ee82..f5eaa82 160000 --- a/themes/zen +++ b/themes/zen @@ -1 +1 @@ -Subproject commit 6d4ee822a88a3dbe2443b2c985523e376f47056f +Subproject commit f5eaa82f7dce4d7d25b7c4e9f7c56a356c1d82a2