Merge branch 'main' into 40c3
All checks were successful
/ build (pull_request) Successful in 1m39s
/ accessibility (pull_request) Successful in 3m26s

Resolves conflicts in content/{de,en}/_index.md: keeps the 40C3 launch
text from 40c3 over main's "coming soon" teaser, and takes main's
"Hackertours" spelling and front matter (#68).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Vincent Mahnke 2026-11-09 22:31:26 +01:00
commit 32762bc22f
Signed by: ViMaSter
GPG key ID: 6D787326BA7D6469

View file

@ -1,3 +1,4 @@
{{ partial "lint-brand.html" . }}
<!DOCTYPE html>
<html class="nojs" lang="{{ site.Language.Locale | default site.Language.Name }}" dir="{{ site.Language.Direction | default "ltr" }}"{{ with $.Param "colorScheme" }} data-theme="{{ . }}"{{ end }}>
<head>
@ -27,10 +28,9 @@
<img src="{{ with $.Param "logopath" }}{{ . | relURL }}{{ else }}{{ "images/logo.png" | relURL }}{{ end }}"{{ with $.Param "logowidth" }} width="{{ . }}"{{ end }}{{ with $.Param "logoheight" }} height="{{ . }}"{{ end }} alt="{{ i18n "logo_alt" }}" class="header__logo-image">
</a>
{{ end -}}
<div class="header__intro">
<div class="header__intro_headline"><a href="{{ site.Home.RelPermalink }}" class="header__site-link" rel="home"><span>{{ site.Title }}</span></a></div>
<div class="header__intro_text">{{ .Param "intro" }}</div>
</div>
<h1 class="header__site-name">
<a href="{{ site.Home.RelPermalink }}" rel="home" class="header__site-link">{{ site.Title }}</a>
</h1>
<div class="region header__region">
{{ if hugo.IsMultilingual }}{{ partial "language-selector.html" . }}{{ end -}}
{{ if $.Param "menuinheader" }}{{ partial "menu.html" . }}{{ end -}}