diff --git a/README.md b/README.md index 71a9951..e04f1e9 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. The page reserves space for the bar so it does +not cover content. ## Brand spelling check @@ -215,6 +216,31 @@ In the GeoJSON, `coordinates` are already in `[lon, lat]` order, the colour and Hugo crops the thumbnails to squares (keeping the most interesting part of the picture) at build time; the lightbox shows the original file. Without JavaScript, a thumbnail links to the original file. A missing image, a missing `alt` or a `gallery-image` outside a `gallery` stops the build with an error that names the page. +## Shortcode: Event cards + +The home page (`content/*/_index.md`) lists the events as cards with `{{< events >}}`, modelled on the cards of the [40C3 start page](https://events.ccc.de/congress/2026/infos/startpage.html). It reads `data/events.yaml`, which is shared by both languages, and shows the events in the order of the file, newest first: + +```yaml +events: + - event: 39c3 + title: { de: 39. Chaos Communication Congress, en: 39th Chaos Communication Congress } + motto: Power Cycles + start: "2025-12-27" + end: "2025-12-30" + venue: CCH +``` + +- `event` is the name of the event's section (`content/*//`), which the card links to. The card's heading shows it in capitals (`39C3`); `name` (optional) replaces that. +- `title` is the event's full name, with one entry per language, or one for both: `title: Easterhegg 2025`. +- `motto` and `venue` are shown as they are. +- `start` and `end` are `YYYY-MM-DD`. The card shows the range in the page's language, as on the 40C3 start page: `27.–30. Dezember 2025`, `27–30 December 2025`. Leave out `end` for a one-day event. +- `status` (optional): `inprogress` greys the card out, without a link, and marks it "In Vorbereitung" / "In progress", for an event whose tours aren't online yet. Remove it once the event's section exists. +- `credit` (optional) names the logo's authors and licence in Markdown, for logos whose licence asks for it. It is shown in the footer of the pages with the cards. + +The heading shows the event's logo, `assets/img/events/.svg`, in the text colour. The SVG's own colours are ignored, only its shape counts, so use a version without a background. Where each logo comes from, and its licence, is listed in [assets/img/events/Sources.txt](assets/img/events/Sources.txt). + +An event without a section, that isn't in progress either, gets a greyed-out card without a link, and the build logs a warning, as it does for a missing logo. Without a data file, or without any events in it, the shortcode renders nothing and the build logs a warning; to silence it, add `warning-events-empty` to `ignoreLogs` in `hugo.yaml`. + ## Accessibility check CI runs [pa11y-ci](https://github.com/pa11y/pa11y-ci) with the axe and HTML_CodeSniffer rules for WCAG 2 AA on every push and pull request, in its own job (`accessibility`), so findings show up without blocking the deploy. To run the same check locally (needs Node.js, Python 3 and Chrome or Chromium): diff --git a/assets/css/_custom.css b/assets/css/_custom.css index ecb8a18..bb6c079 100644 --- a/assets/css/_custom.css +++ b/assets/css/_custom.css @@ -1,32 +1,197 @@ @import './_schedule.css'; @import './_tour-map.css'; @import './_gallery.css'; +@import './_events.css'; +/* + * 40C3 "MODEL_CITIZENS" design, after the 40C3 styleguide and the 40C3 startpage + * (events.ccc.de/congress/2026/infos/startpage.html). + * Key colours: green (0), paper (A) and ink (B); the other colours are accents. + * Dark: ink background, paper text, green accents. + * Light: paper background and ink text. + * Paper is the startpage's light green (#dff0d4), not the styleguide's grey (#ebedf0). + * WCAG AA contrast: on ink every palette colour works as text, but on the light background + * only the foreground does. So in the light scheme green is only ever a fill or a line, + * with foreground-coloured text on it. + */ +:root { + --c40-green: #75b44b; + --c40-teal: #15ada3; + --c40-periwinkle: #9fa4e8; + --c40-lilac: #c892d6; + --c40-pink: #ee5da2; + --c40-coral: #ea6f82; + --c40-orange: #f88a30; + --c40-amber: #ffbc40; + --c40-paper: #dff0d4; + --c40-ink: #001300; + + --c40-light-bg: var(--c40-paper); + --c40-light-fg: var(--c40-ink); + + /* Text on green and amber fills. */ + --c40-on-fill: light-dark(var(--c40-light-fg), var(--c40-ink)); + + /* Hack has a large x-height, so 16px reads about as big as the old 18px serif. */ + --base-font-size: 16; + + /* Jersey 10 is a small pixel font; it needs about this much more size to match Hack. */ + --display-scale: 1.45; + + /* On macOS, Menlo has the same character width as Hack, so text doesn't move when Hack takes + over. Not ui-monospace: that is SF Mono in Safari, which is wider. */ + --ff-body: 'Hack', Menlo, Consolas, monospace; + --ff-headings: var(--ff-body); + --ff-alt: var(--ff-body); + --ff-monospace: var(--ff-body); + --ff-display: 'Jersey 10', var(--ff-body); + + /* Square corners, like the pixel boxes in the styleguide. */ + --radius-xl: 0; + --radius-l: 0; + --radius-m: 0; + --radius-s: 0; + --radius-xs: 0; + + --color-body-bg: light-dark(var(--c40-light-bg), var(--c40-ink)); + --color-page-bg: transparent; + --color-header-bg: transparent; + --color-footer-bg: transparent; + + --color-text: light-dark(var(--c40-light-fg), var(--c40-paper)); + --color-text-bg: light-dark(var(--c40-light-bg), var(--c40-ink)); + --color-text-meta: light-dark( + color-mix(in srgb, var(--c40-light-fg) 78%, var(--c40-light-bg)), + color-mix(in srgb, var(--c40-paper) 80%, var(--c40-ink)) + ); + --color-headings: var(--color-text); + --color-code: var(--color-text); + + --color-link: light-dark(var(--c40-light-fg), var(--c40-green)); + --color-link-visited: var(--color-link); + --color-link-hover: var(--c40-on-fill); + --color-link-active: var(--c40-on-fill); + + --color-button: var(--c40-green); + --color-button-text: var(--c40-on-fill); + --color-button-hover: var(--c40-amber); + --color-button-text-hover: var(--c40-on-fill); + + --color-border: light-dark(var(--c40-light-fg), var(--c40-green)); + --color-border-light: var(--color-border); + --color-border-dark: var(--color-border); + + --color-mobile-menu: var(--color-body-bg); + + --color-accent: var(--c40-green); + --color-highlight: var(--c40-amber); + --color-mark-highlight: var(--c40-amber); + --color-row-odd: light-dark( + color-mix(in srgb, var(--c40-light-fg) 7%, var(--c40-light-bg)), + color-mix(in srgb, var(--c40-paper) 9%, var(--c40-ink)) + ); + + --color-info: var(--c40-teal); + --color-success: var(--c40-green); + --color-warning: var(--c40-amber); + --color-error: var(--c40-coral); + + --color-focus: light-dark(var(--c40-light-fg), var(--c40-amber)); +} + +:focus-visible { + outline: 3px solid var(--color-focus); + outline-offset: 2px; +} + +/* Long URLs, the e-mail address and long German words would otherwise make pages wider than a + phone screen, and mobile browsers then zoom the whole page out. Links get `anywhere` because + break-word doesn't shrink the theme's table-style lists (`article > ul`). */ +body { + overflow-wrap: break-word; +} + +.layout__main a { + overflow-wrap: anywhere; +} + +/* Links: underlined, and a green chip with dark text on hover and focus (AA in both schemes). */ +a:hover, +a:focus-visible { + background: var(--c40-green); +} + +.header__logo:hover, +.header__logo:focus-visible { + background: none; +} + +mark { + color: var(--c40-on-fill); +} + +/* Headings: Jersey 10 for the big ones, as on the 40C3 startpage. Page titles (h1) are capitals + in the foreground colour (green in the dark scheme), section headings (h2) capitals on a green + box. Post titles in lists and the schedule's days are plain h2s, the size of the card titles. + h3 and below are Hack Bold, h3 underlined like the styleguide's subheads. */ +h1, +h2 { + color: light-dark(var(--c40-light-fg), var(--c40-green)); + font-family: var(--ff-display); + /* Jersey 10 has a single weight; like the startpage, this has browsers draw it bolder. */ + font-weight: bold; + letter-spacing: 0; + line-height: normal; +} + +h1 { + font-size: min(3rem, calc(var(--fs-xxl) * var(--display-scale))); + text-transform: uppercase; +} + +h2 { + font-size: calc(var(--fs-l) * var(--display-scale)); +} + +h2:not(.title, .schedule__day-title) { + width: fit-content; + padding-inline: 1rem; + background: var(--c40-green); + color: var(--c40-on-fill); + font-size: min(2.4rem, calc(var(--fs-xl) * var(--display-scale))); + text-transform: uppercase; +} + +h3 { + font-size: var(--fs-l); + text-decoration: underline; + text-decoration-thickness: 2px; + text-underline-offset: 0.25em; +} + +.title-post-date { + display: block; + margin-left: 0; + color: var(--color-text-meta); + font-family: var(--ff-body); + font-size: var(--fs-s); + letter-spacing: 0; +} + +/* The line breaks in the home page's intro text are meant. */ .intro-text { white-space: pre-line; } +/* Branding: the logo, and the site name set like the page titles. */ +.header { + color: var(--color-text); +} + .header__logo { flex-shrink: 0; } -/* Header 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 +204,86 @@ } } -/* 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); +/* The name takes the heading's colour; on hover and focus it gets the links' green chip, with + dark text, because green text would vanish on it. */ +.header__site-link { + &:link, + &:visited { + color: inherit; + } + + &:hover, + &:focus-visible { + color: var(--c40-on-fill); + text-decoration: underline; + } } -.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; +/* 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; } -.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 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, - &: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%); +/* 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; - [data-navopen] & { - transform: translateY(0); + 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); + } } } -.mobile-nav__region .language-selector ul { - flex: 1; - flex-direction: column; -} - -.language-selector a { - display: flex; - align-items: center; - gap: 0.45em; -} - -.language-selector .language-icon { +.language-icon { inline-size: 1.1em; block-size: 1.1em; flex-shrink: 0; @@ -123,77 +291,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/_events.css b/assets/css/_events.css new file mode 100644 index 0000000..d572660 --- /dev/null +++ b/assets/css/_events.css @@ -0,0 +1,147 @@ +/* + * Event cards on the home page (events shortcode), after the cards on the 40C3 start page + * (events.ccc.de/congress/2026/infos/startpage.html): a frame with a heading bar that holds the + * event's logo, drawn in the text colour like the start page's icons. Cards of past events link to + * their tours and fill the heading bar on hover and focus; an event in progress is greyed out. + */ + +.event-cards { + --event-card-line: 0.125rem; + + /* The start page's neutrals for inactive cards; text contrast about 5.5:1 (light) and 6.5:1 (dark). */ + --event-card-inactive-bg: light-dark(#c9dabf, #162915); + --event-card-inactive-line: light-dark(#b2c4aa, #2d3f2a); + --event-card-inactive-text: light-dark(#435540, #9cae94); + + display: grid; + grid-template-columns: repeat(auto-fill, minmax(min(19rem, 100%), 1fr)); + gap: 2rem; + margin-block: 0 var(--spacing-m); + padding: 0; + list-style: none; +} + +.event-cards__item { + max-width: none; +} + +.event-card { + display: flex; + flex-direction: column; + block-size: 100%; + border: var(--event-card-line) solid var(--c40-green); + background: var(--color-body-bg); + color: var(--color-text); + text-decoration: none; +} + +.event-card__heading { + display: flex; + align-items: center; + justify-content: space-between; + gap: 1rem; + padding: 0.5rem 1rem; + border-block-end: var(--event-card-line) solid var(--c40-green); + color: light-dark(var(--c40-light-fg), var(--c40-green)); +} + +.event-card__title { + max-width: none; + margin: 0; + color: inherit; + font-family: var(--ff-display); + font-size: calc(var(--fs-l) * var(--display-scale)); + font-weight: bold; + line-height: 1; + text-decoration: none; +} + +/* The logo as a mask in the text colour, 2rem high (the start page's size-8 icons); wide + wordmarks shrink to leave room for the title. */ +.event-card__logo { + flex: none; + max-inline-size: 60%; + block-size: 2rem; + background-color: currentcolor; + mask: var(--event-logo) right center / contain no-repeat; +} + +.event-card__body { + display: flex; + flex-direction: column; + flex-grow: 1; + gap: 0.25rem; + padding: 0.5rem 1rem 0.75rem; + + p { + margin: 0; + } +} + +.event-card__motto { + font-weight: bold; +} + +.event-card__meta { + color: var(--color-text-meta); + font-size: var(--fs-s); +} + +.event-card__status { + align-self: flex-start; + margin-block-start: 0.25rem; + padding: 0.1rem 0.5rem; + border: var(--event-card-line) solid currentcolor; + font-size: var(--fs-xs); + font-weight: bold; + letter-spacing: 0.03em; + text-transform: uppercase; + width: 100%; + text-align: center; + margin-top: 0.5em !important; +} + +.event-card--inactive { + border-color: var(--event-card-inactive-line); + background: var(--event-card-inactive-bg); + color: var(--event-card-inactive-text); + + .event-card__heading { + border-color: var(--event-card-inactive-line); + color: inherit; + } + + .event-card__meta { + color: inherit; + } +} + +/* Hover and focus: the heading bar is filled, ink in the light scheme and green in the dark one, + and the text below is underlined like a link. */ +a.event-card:hover, +a.event-card:focus-visible { + border-color: light-dark(var(--c40-ink), var(--c40-green)); + background: var(--color-body-bg); + + .event-card__heading { + border-color: light-dark(var(--c40-ink), var(--c40-green)); + background: light-dark(var(--c40-ink), var(--c40-green)); + color: light-dark(var(--c40-green), var(--c40-ink)); + } + + .event-card__body { + text-decoration: underline; + } +} + +/* Forced colours drop background colours, and with them the masked logos. */ +@media (forced-colors: active) { + .event-card__logo { + background-color: CanvasText; + forced-color-adjust: none; + } + + a.event-card .event-card__logo { + background-color: LinkText; + } +} diff --git a/assets/css/_fonts.css b/assets/css/_fonts.css new file mode 100644 index 0000000..783d6ee --- /dev/null +++ b/assets/css/_fonts.css @@ -0,0 +1,2 @@ +/* The @font-face rules are not part of this bundle: head/fonts.html generates them from + assets/css/fonts.css.tmpl, and explains why. */ diff --git a/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/css/fonts.css.tmpl b/assets/css/fonts.css.tmpl new file mode 100644 index 0000000..1830d9a --- /dev/null +++ b/assets/css/fonts.css.tmpl @@ -0,0 +1,60 @@ +{{- /* Rendered by layouts/_partials/head/fonts.html, which explains why. */ -}} +{{- $url := dict -}} +{{- range slice "Jersey10-latin-ext" "Hack-Regular" "Hack-Italic" "Hack-Bold" "Hack-BoldItalic" -}} + {{- $url = merge $url (dict . (resources.Get (printf "fonts/%s.woff2" .) | fingerprint).RelPermalink) -}} +{{- end -}} +{{- $jersey := (resources.Get "fonts/Jersey10-latin.woff2").Content | base64Encode -}} +/* 40C3 "MODEL_CITIZENS" styleguide fonts, self-hosted (SIL OFL / MIT, see static/fonts). + Jersey 10: headings. Hack: body text and subheads. + Hack is subset to Latin (Latin-1, Latin Extended-A, general punctuation). */ + +/* The Latin subset of Jersey 10 is embedded, so German and English headings are never drawn in the fallback font. */ +@font-face { + font-family: 'Jersey 10'; + src: url('data:font/woff2;base64,{{ $jersey }}') format('woff2'); + font-weight: 400; + font-style: normal; + font-display: swap; + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +@font-face { + font-family: 'Jersey 10'; + src: url('{{ index $url "Jersey10-latin-ext" }}') format('woff2'); + font-weight: 400; + font-style: normal; + font-display: swap; + unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; +} + +@font-face { + font-family: 'Hack'; + src: url('{{ index $url "Hack-Regular" }}') format('woff2'); + font-weight: 400; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Hack'; + src: url('{{ index $url "Hack-Italic" }}') format('woff2'); + font-weight: 400; + font-style: italic; + font-display: swap; +} + +@font-face { + font-family: 'Hack'; + src: url('{{ index $url "Hack-Bold" }}') format('woff2'); + font-weight: 700; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Hack'; + src: url('{{ index $url "Hack-BoldItalic" }}') format('woff2'); + font-weight: 700; + font-style: italic; + font-display: swap; +} diff --git a/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/assets/img/events/37c3.svg b/assets/img/events/37c3.svg new file mode 100644 index 0000000..926f429 --- /dev/null +++ b/assets/img/events/37c3.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/img/events/38c3.svg b/assets/img/events/38c3.svg new file mode 100644 index 0000000..505dbeb --- /dev/null +++ b/assets/img/events/38c3.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/img/events/39c3.svg b/assets/img/events/39c3.svg new file mode 100644 index 0000000..19fddb9 --- /dev/null +++ b/assets/img/events/39c3.svg @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/assets/img/events/40c3.svg b/assets/img/events/40c3.svg new file mode 100644 index 0000000..9146ede --- /dev/null +++ b/assets/img/events/40c3.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/img/events/Sources.txt b/assets/img/events/Sources.txt new file mode 100644 index 0000000..bf3fbb7 --- /dev/null +++ b/assets/img/events/Sources.txt @@ -0,0 +1,18 @@ +Event logos for the event cards on the home page (events shortcode, data/events.yaml). +The cards use them as masks in the text colour, so the colours in the files don't matter. +All files are unmodified copies of the originals. + +37c3.svg https://designs.events.ccc.de/37C3/37c3-logo-full-black.svg +38c3.svg https://designs.events.ccc.de/38C3/logo-simple.svg +39c3.svg https://designs.events.ccc.de/39C3/39C3-Logo-RGB_muted-black.svg + From the CCC event design archive, https://designs.events.ccc.de/ + +40c3.svg https://events.ccc.de/congress/2026/infos/assets/favicon.svg + The 40C3 symbol from the 40C3 info pages; the design archive has no 40C3 entry yet. + +eh22.svg logo/logo_simple.svg from the Easterhegg 2025 design repository, + https://git.hamburg.ccc.de/EH22/design-public + By kritzl, traumweh & Schrottkatze, licensed under CC BY-SA 4.0, + https://creativecommons.org/licenses/by-sa/4.0/ + The home page credits it below the cards (credit in data/events.yaml). + The design archive's EH22 logo is a raster image with a glow, which doesn't work as a mask. diff --git a/assets/img/events/eh22.svg b/assets/img/events/eh22.svg new file mode 100644 index 0000000..0ab3f5d --- /dev/null +++ b/assets/img/events/eh22.svg @@ -0,0 +1,34 @@ + + + + + + + + + + diff --git a/content/de/37c3/electrum/index.md b/content/de/37c3/electrum/index.md index 089b023..a5ded77 100644 --- a/content/de/37c3/electrum/index.md +++ b/content/de/37c3/electrum/index.md @@ -10,7 +10,7 @@ Das electrum ist Hamburgs Museum der Elektrizität und Technik. Ohne Strom geht {{< gallery-image src="Electrum_Hamburg-Harburg.nnw.jpg" alt="Museum electrum in Hamburg-Harburg, cc-by-sa NordNordWest" >}} {{< /gallery >}} -# Daten +## Daten * Tag 1 (27.12) **12:30 Uhr** * Dauer: 1,5h * Spache: Deutsch diff --git a/content/de/38c3/electrum/index.md b/content/de/38c3/electrum/index.md index 7e59539..3d1dcd9 100644 --- a/content/de/38c3/electrum/index.md +++ b/content/de/38c3/electrum/index.md @@ -18,7 +18,7 @@ Lizenz: (https://creativecommons.org/licenses/by-sa/3.0/de/legalcode) Das Museum wird von einem Verein geführt und unterstützt. Ihr seid herzlich dazu eingeladen, den Verein ebenfalls, entweder aktiv oder passiv, zu unterstützen, z. B. in [Form einer Vereinsmitgliedschaft](https://www.electrum-hamburg.de/content/download/71/298?version=2). -# Daten +## Daten * ~~Tag 3 (29.12.) **13:45 Uhr** Deutsch~~ ausgebucht * ~~Tag 3 (29.12.) **14:45 Uhr** Englisch~~ ausgebucht * Dauer: 1 Stunde diff --git a/content/de/_index.md b/content/de/_index.md index ed1c211..3b94b78 100644 --- a/content/de/_index.md +++ b/content/de/_index.md @@ -14,6 +14,8 @@ cascade: intro: Wir von Hamburg Hackertours zeigen euch die Stadt! --- +## 40C3 + Für den [40C3](https://events.ccc.de/category/40c3/) haben wir interessante Orte in und um Hamburg gefunden, an denen ihr für ein paar Stunden in andere Welten eintauchen und spannende Dinge erleben könnt. [Wie das funktioniert, erklären wir euch hier in unseren FAQ]({{< relref "faq/_index" >}})! Hackertours ist auch auf **[Mastodon](https://chaos.social/@hackertours)**! @@ -26,6 +28,8 @@ Hackertours-Desk: DECT 8687 "TOUR", +49 40 573 0830 8687 ![Hamburger Hacker Ausflüge am CCC. CC0 Amzi](hackertours_banner.webp) -Frühere Veranstaltungen: [37C3](37c3) / [38C3](38c3) / [EH22](eh22) / [39C3](39c3) +## Veranstaltungen + +{{< events >}} ## News diff --git a/content/de/faq/_index.md b/content/de/faq/_index.md index 76f6388..41af9eb 100644 --- a/content/de/faq/_index.md +++ b/content/de/faq/_index.md @@ -1,5 +1,5 @@ --- -title: 'Die Hackertours für den 39C3 – FAQ' +title: '39C3 FAQ' date: 2023-12-07T18:46:19+01:00 menus: main: diff --git a/content/en/_index.md b/content/en/_index.md index 2dbe876..4bef33d 100644 --- a/content/en/_index.md +++ b/content/en/_index.md @@ -14,6 +14,8 @@ cascade: intro: Let Hamburg Hackertours show you around the city! --- +## 40C3 + For [40C3](https://events.ccc.de/category/40c3/) we have found interesting places in and around Hamburg where you can delve into other worlds and experience fascinating things for a few hours. [We are going to explain how this works here in our FAQ article]({{< relref "faq/_index" >}})! Hackertours is also on **[Mastodon](https://chaos.social/@hackertours)**! @@ -26,7 +28,9 @@ Hackertours Desk: DECT 8687 "TOUR", +49 40 573 0830 8687 ![Hamburger Hacker Ausflüge am CCC. CC0 Amzi](hackertours_banner.webp) -Previous events: [37C3](37c3) / [38C3](38c3) / [EH22](eh22) / [39C3](39c3) +## Events + +{{< events >}} ## News \ No newline at end of file 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/data/events.yaml b/data/events.yaml new file mode 100644 index 0000000..949e184 --- /dev/null +++ b/data/events.yaml @@ -0,0 +1,37 @@ +# Event cards on the home page, rendered by the events shortcode, newest first. +# event: the event's section (content/*//) and logo (assets/img/events/.svg). +# status: inprogress greys out the card and leaves out the link, for an event without tours yet. +# credit: the logo's authors and licence in Markdown, shown in the footer of pages with the cards. +events: + - event: 40c3 + title: { de: 40. Chaos Communication Congress, en: 40th Chaos Communication Congress } + motto: Model Citizens + start: "2026-12-27" + end: "2026-12-30" + venue: Hamburg Messe + status: inprogress + - event: 39c3 + title: { de: 39. Chaos Communication Congress, en: 39th Chaos Communication Congress } + motto: Power Cycles + start: "2025-12-27" + end: "2025-12-30" + venue: CCH + - event: eh22 + title: Easterhegg 2025 + motto: Unhandled Eggception + start: "2025-04-18" + end: "2025-04-21" + venue: Kampnagel + credit: "[kritzl, traumweh & Schrottkatze](https://git.hamburg.ccc.de/EH22/design-public), [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/)" + - event: 38c3 + title: { de: 38. Chaos Communication Congress, en: 38th Chaos Communication Congress } + motto: Illegal Instructions + start: "2024-12-27" + end: "2024-12-30" + venue: CCH + - event: 37c3 + title: { de: 37. Chaos Communication Congress, en: 37th Chaos Communication Congress } + motto: Unlocked + start: "2023-12-27" + end: "2023-12-30" + venue: CCH 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/i18n/de.yaml b/i18n/de.yaml index 65062a4..2a70b54 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -1,6 +1,11 @@ calendar_meeting_point: "Hackertours-Desk" calendar_ics: "iCal Download" calendar_google: "Google Calendar" +events_inprogress: "In Vorbereitung" +events_logo: "Logo {{ .Name }}" +events_date: "2. January 2006" +events_date_day_month: "2. January" +events_date_day: "2." gallery_enlarge: "Großansicht" gallery_dialog: "Bildansicht" gallery_close: "Schließen" diff --git a/i18n/en.yaml b/i18n/en.yaml index 3a754f3..5c78c00 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -1,6 +1,11 @@ calendar_ics: "iCal download" calendar_google: "Google calendar" calendar_meeting_point: "Hackertours Desk" +events_inprogress: "In progress" +events_logo: "{{ .Name }} logo" +events_date: "2 January 2006" +events_date_day_month: "2 January" +events_date_day: "2" gallery_enlarge: "enlarge" gallery_dialog: "Image viewer" gallery_close: "Close" diff --git a/layouts/_partials/footer.html b/layouts/_partials/footer.html new file mode 100644 index 0000000..0e63352 --- /dev/null +++ b/layouts/_partials/footer.html @@ -0,0 +1,14 @@ +{{- /* Overrides the zen theme's footer.html. Same as the theme's, plus the 40C3 logo and, on pages +with event cards, the credits for event logos whose licence asks for one (credit in data/events.yaml). */ -}} +{{ if $.Param "feedlinks" }}{{ partial "feedlinks.html" . }}{{ end -}} + +

{{ with site.Copyright }}{{ . | site.Home.RenderString }}{{ else }}© {{ site.Title }}{{ end }}

+{{- if .HasShortcode "events" }} +{{- $credits := slice }} +{{- with hugo.Data.events }}{{ range .events }}{{ if .credit }}{{ $credits = $credits | append (dict "name" (.name | default (upper .event)) "credit" .credit) }}{{ end }}{{ end }}{{ end }} +{{- with $credits }} +

{{ range $index, $entry := . }}{{ if $index }} · {{ end }}{{ i18n "events_logo" (dict "Name" $entry.name) }}: {{ $entry.credit | site.Home.RenderString }}{{ end }}

+{{- end }} +{{- 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..94a21b7 100644 --- a/layouts/_partials/head/extra.html +++ b/layouts/_partials/head/extra.html @@ -1,3 +1,7 @@ +{{ partial "head/fonts.html" . }} +{{- /* 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/head/fonts.html b/layouts/_partials/head/fonts.html new file mode 100644 index 0000000..0318665 --- /dev/null +++ b/layouts/_partials/head/fonts.html @@ -0,0 +1,25 @@ +{{- /* +Self-hosted fonts: Jersey 10 for headings and Hack for everything else (assets/fonts, licences in +static/fonts). Their @font-face rules are generated from assets/css/fonts.css.tmpl instead of +being part of the main stylesheet. A web font that arrives after the first paint swaps in and +moves the page: Jersey 10 is far narrower than the monospace fallback, so the heading chips +changed their width, and the page transition made that visible on every language switch. + +- The Latin subset of Jersey 10 is embedded in the stylesheet, so it is there at the first paint + whatever the connection, and without a request that the browser would have to revalidate. +- Hack is preloaded, so the body text is not first drawn in a fallback font of a different + character width (SF Mono in Safari, Consolas on Windows). Its URL here and in @font-face come + from the same fingerprinted resource, so they are identical (and correct below a sub path, as + on the PR previews). +*/ -}} +{{- with resources.Get "css/fonts.css.tmpl" | resources.ExecuteAsTemplate "css/fonts.tmpl.css" . }} + {{- /* The executed template has no media type (from ".tmpl"), which minify needs. */ -}} + {{- with resources.FromString "css/fonts.css" .Content | minify | fingerprint }} + + {{- end }} +{{- end }} +{{- range slice "Hack-Regular" "Hack-Bold" }} + {{- with resources.Get (printf "fonts/%s.woff2" .) | fingerprint }} + + {{- end }} +{{- end }} diff --git a/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/_shortcodes/events.html b/layouts/_shortcodes/events.html new file mode 100644 index 0000000..b8de3a8 --- /dev/null +++ b/layouts/_shortcodes/events.html @@ -0,0 +1,75 @@ +{{- /* +Event cards from data/events.yaml, after the cards on the 40C3 start page +(events.ccc.de/congress/2026/infos/startpage.html): the event's name and logo +(assets/img/events/.svg) in a heading bar, its motto, full name, dates and venue below. +Cards link to the event's section; an event that is in progress, or has no section, gets a +greyed-out card without a link. Logo credits from the data file are in the footer (footer.html). + +Usage: {{< events >}} +*/ -}} +{{- $events := slice -}} +{{- with hugo.Data.events }}{{ with .events }}{{ $events = . }}{{ end }}{{ end -}} +{{- if not $events -}} + {{- warnidf "warning-events-empty" "events: no events in data/events.yaml: %s" .Position -}} +{{- else -}} +
    +{{- range $events }} +{{- $name := .name | default (upper .event) }} +{{- $inProgress := eq .status "inprogress" }} +{{- $page := site.GetPage (printf "/%s" .event) }} +{{- if not (or $page $inProgress) }}{{ warnf "events: no section page for event %q" .event }}{{ end }} +{{- $link := and $page (not $inProgress) }} +{{- /* A title with one entry per language, or one for all. */}} +{{- $title := .title }} +{{- if reflect.IsMap $title }}{{ $title = index $title site.Language.Name | default (index $title "en") }}{{ end }} +{{- /* Date ranges as on the 40C3 start page: "27.–30. Dezember 2026", "27–30 December 2026". */}} +{{- $start := time.AsTime .start }} +{{- $end := time.AsTime (.end | default .start) }} +{{- $date := i18n "events_date" }} +{{- $when := $end | time.Format $date }} +{{- if ne $start.Year $end.Year }} + {{- $when = printf "%s – %s" ($start | time.Format $date) $when }} +{{- else if ne $start.Month $end.Month }} + {{- $when = printf "%s – %s" ($start | time.Format (i18n "events_date_day_month")) $when }} +{{- else if ne $start.Day $end.Day }} + {{- $when = printf "%s–%s" ($start | time.Format (i18n "events_date_day")) $when }} +{{- end }} +{{- /* The logo keeps its proportions (the SVG's viewBox) at the height set in CSS. */}} +{{- $logo := resources.Get (printf "img/events/%s.svg" .event) }} +{{- $ratio := slice 1 1 }} +{{- with $logo }} + {{- with findRESubmatch `viewBox="\s*[-\d.]+[\s,]+[-\d.]+[\s,]+([\d.]+)[\s,]+([\d.]+)\s*"` .Content 1 }} + {{- $ratio = slice (float (index . 0 1)) (float (index . 0 2)) }} + {{- end }} +{{- else }} + {{- warnf "events: no logo assets/img/events/%s.svg" .event }} +{{- end }} +
  • +{{- if $link }} + +{{- else }} +{{ end }} +
  • +{{- 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/home-baseof.html b/layouts/home-baseof.html index adc1178..c735616 100644 --- a/layouts/home-baseof.html +++ b/layouts/home-baseof.html @@ -15,7 +15,6 @@ {{ partial "head/extra.html" . }} {{ block "head" . }}{{ end }} {{ if .HasShortcode "schedule" }}{{ partial "schedule-script.html" . }}{{ end }} -{{ if .HasShortcode "tour-map" }}{{ partial "tour-map-script.html" . }}{{ end }} {{ if .HasShortcode "gallery" }}{{ partial "gallery-script.html" . }}{{ end }} 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/site.webmanifest b/static/site.webmanifest index ead2b68..4214259 100644 --- a/static/site.webmanifest +++ b/static/site.webmanifest @@ -15,7 +15,7 @@ "purpose": "maskable" } ], - "theme_color": "#ffffff", - "background_color": "#ffffff", + "theme_color": "#dff0d4", + "background_color": "#dff0d4", "display": "standalone" } \ No newline at end of file