Merge branch 'main' of https://git.luj0ga.de/franconian/www.franconian.net into main

assets/_breakpoints.scss

@@ -0,0 +1,2 @@
+$small:  800px;
+$large: 1200px;

assets/_mixins.scss

@@ -0,0 +1,5 @@
+@mixin heading {
+	font-family: Orbitron, sans-serif;
+	font-weight: 900;
+	text-transform: uppercase;
+}

assets/style.scss

@@ -1,5 +1,7 @@
-@import 'fonts';
+@import 'breakpoints';
 @import 'colors';
+@import 'fonts';
+@import 'mixins';
 
 * {
 	font-family: Montserrat, sans-serif;
@@ -22,13 +24,30 @@ header {
 }
 
 main {
-	max-width: 1200px;
+	width: 100%;
-	margin: auto;
+	max-width: $large;
+	margin: 0 auto;
+
+	flex-grow: 1;
 }
 
 footer {
-	text-align: center;
+	width: 100%;
+	max-width: $large;
+	margin: 0 auto;
 	padding: 0.5em;
+
+	display: flex;
+	align-items: center;
+	flex-direction: column;
+
+	@media screen and (min-width: $small) {
+		flex-direction: row;
+
+		& > :first-child {
+			margin-left: auto;
+		}
+	}
 }
 
 h1, h2, h3, h4, h5, h6, p {
@@ -37,19 +56,13 @@ h1, h2, h3, h4, h5, h6, p {
 }
 
 h1, h2, h3, h4, h5, h6 {
-	font-family: Orbitron, sans-serif;
+	@include heading;
-	font-weight: 900;
-	text-transform: uppercase;
 }
 
 h1 {
 	border-bottom: 2px $text-color solid;
 }
 
-a {
-	text-decoration: none;
-}
-
 figure {
 	margin-bottom: 1rem;
 
@@ -64,26 +77,15 @@ figure {
 	}
 }
 
-.wrapper {
-	flex: 1;
-}
-
 .nav {
-	max-width: 1200px;
-	margin: 0 auto;
-	padding: 0.5em;
-
 	display: flex;
 	flex-direction: column;
 	justify-content: space-between;
 
-	@media screen and (min-width: 800px) {
+	&.nav-main {
-		flex-direction: row;
+		max-width: $large;
-
+		margin: 0 auto;
-		hr {
+		padding: 0.5em;
-			margin: 0 0.5em !important;
-			align-self: center;
-		}
 	}
 
 	hr {
@@ -91,20 +93,20 @@ figure {
 	}
 
 	.nav-logo {
-		font-family: Orbitron, sans-serif;
+		@include heading;
-		font-weight: 900;
+		text-decoration: none;
-		text-transform: uppercase;
+
 		margin: 0 auto;
 
-		@media screen and (min-width: 800px) {
+		img {
-			margin-left: 0;
+			width: 48px;
+			display: inline-block;
+			margin-right: 1em;
+			vertical-align: middle;
 		}
 
-		img {
+		@media screen and (min-width: $small) {
-			width: 64px;
+			margin-left: 0;
-			display: inline-block;
-			padding-right: 1em;
-			vertical-align: middle;
 		}
 	}
 
@@ -115,4 +117,13 @@ figure {
 		&.nav-link-active {
 		}
 	}
+
+	@media screen and (min-width: $small) {
+		flex-direction: row;
+
+		hr {
+			margin: 0 0.5em;
+			align-self: center;
+		}
+	}
 }

config.toml

@@ -1,5 +1,6 @@
 baseURL = "https://www.franconian.net/"
 title = "franconian.net"
+enableGitInfo = true
 
 [languages]
   [languages.en]

content/_index.de.md

@@ -1,5 +1,8 @@
 ---
-title: franconian.net
+title: Startseite
+menu:
+  main:
+    weight: 1
 ---
 
 {{<image src="/header.png" alt=`Ein Router in Form des Frankenrechens mit der Aufschrift "franconian.net" und einem "Fenster" in die Welt des rC3. Daran angeschlossen sind die Hackspaces backspace, Hackzogtum und Nerd2Nerd.`>}}

content/_index.md

@@ -1,5 +1,8 @@
 ---
-title: franconian.net
+title: Home
+menu:
+  main:
+    weight: 1
 ---
 
 {{<image src="/header.png" alt=`A router labelled "franconian.net" with a "window" to the world of rC3 and the hackspaces backspace, Hackzogtum, and Nerd2Nerd connected to it.`>}}

content/about.de.md

@@ -2,7 +2,7 @@
 title: Über uns
 menu:
   main:
-    weight: 2
+    weight: 4
 ---
 
 franconian.net ist ein loses Netzwerk von einigen fränkischen Hackspaces, das sich erstmalig zum Chaos Communication Camp 2019 für ein gemeinsames Village organisiert hat. Dieser Zusammenschluss hat das CCCamp19 überdauert und findet sich vor allem zu weiteren Veranstaltungen des Chaos Computer Clubs immer wieder zusammen. Auch zur remote Chaos Experience haben sich wieder einige dieser Hackspaces gefunden und betreiben zusammen das franconian.net

content/about.md

@@ -2,7 +2,7 @@
 title: About us
 menu:
   main:
-    weight: 2
+    weight: 4
 ---
 
 The Franconian Cluster is a network of franconian hackspaces that organised the Franconian Village at Chaos Communication Camp 2019. After that, we continued our cooperation mainly at other events held by the Chaos Computer Club. For the first Remote Chaos Experience (rC3), some of the involved spaces decided to create a virtual assembly: franconian.net

content/imprint.de.md

@@ -1,5 +1,6 @@
 ---
 title: Impressum
+menu: footer
 ---
 
 backspace e. V.  

content/imprint.md

@@ -1,5 +1,6 @@
 ---
 title: Imprint
+menu: footer
 ---
 
 backspace e. V.  

content/news/_index.de.md

@@ -2,6 +2,6 @@
 title: News
 menu:
   main:
-    weight: 1
+    weight: 2
 ---
 

content/news/_index.md

@@ -2,6 +2,6 @@
 title: News
 menu:
   main:
-    weight: 1
+    weight: 2
 ---
 

content/schedule.de.md

@@ -2,7 +2,7 @@
 title: Programm
 menu:
   main:
-    weight: 4
+    weight: 5
 ---
 
 Das Programm erscheint in Kürze.

content/schedule.md

@@ -1,8 +1,8 @@
 ---
-title: Program
+title: Schedule
 menu:
   main:
-    weight: 4
+    weight: 5
 ---
 
 The schedule for the franconian.net channel will be released shortly.

i18n/de.toml

@@ -1,2 +1,2 @@
-[imprint]
+[last_change]
-other = "Impressum"
+other = "Zuletzt geändert"

i18n/en.toml

@@ -1,2 +1,2 @@
-[imprint]
+[last_change]
-other = "Imprint"
+other = "Last update"

layouts/_default/baseof.html

@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width,initial-scale=1.0">
 	<title>{{ block "title" . }}
-		{{ .Site.Title }}
+		{{ .Title }} | {{ .Site.Title }}
 	{{ end }}</title>
 	<link rel="icon" href="data:;base64,iVBORw0KGgo=">
 	{{ $style := resources.Get "style.scss" | resources.ToCSS (dict "outputStyle" "compressed") }}
@@ -12,8 +12,8 @@
 </head>
 <body>
 	<header>
-		<nav class="nav">
+		<nav class="nav nav-main">
-			<a class="nav-logo" href="{{ .Site.LanguagePrefix }}/"><img src="https://styleguide.rc3.world/Logo/Logo%20Set%203/SVG/Logo%20SD%20blue.svg" alt="Blue version of the rC3 logo">franconian.net</a>
+			<a class="nav-logo" href="{{ .Site.LanguagePrefix }}/"><img src="https://styleguide.rc3.world/Logo/Logo%20Set%203/SVG/Logo%20SD%20blue.svg" alt="Blue version of the rC3 logo">{{ .Site.Title }}</a>
 			{{ if .IsTranslated }}
 			{{ range .Translations }}
 			<a class="nav-link" href="{{ .Permalink }}">{{ .Language.LanguageName }}</a>
@@ -26,12 +26,15 @@
 			{{ end }}
 		</nav>
 	</header>
-	<div class="wrapper">
 	{{ block "main" . }}
 	{{ end }}
-	</div>
 	<footer>
-		<a href="/imprint">{{ i18n "imprint" }}</a>
+		{{ i18n "last_change" . }}: {{ .Lastmod }}
+		<nav class="nav">
+			{{ range .Site.Menus.footer }}
+			<a class="nav-link" href="{{ .URL }}">{{ .Name }}</a>
+			{{ end }}
+		</nav>
 	</footer>
 </body>
 </html>