From 881d8310f6f9d632bfa50bdd23cc585ec179c59c Mon Sep 17 00:00:00 2001 From: Luca Date: Tue, 24 Nov 2020 19:31:03 +0100 Subject: [PATCH 1/7] Remove unsemantic wrapper --- assets/_mixins.scss | 5 +++++ assets/style.scss | 21 +++++++++------------ layouts/_default/baseof.html | 2 -- 3 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 assets/_mixins.scss diff --git a/assets/_mixins.scss b/assets/_mixins.scss new file mode 100644 index 0000000..070c862 --- /dev/null +++ b/assets/_mixins.scss @@ -0,0 +1,5 @@ +@mixin heading { + font-family: Orbitron, sans-serif; + font-weight: 900; + text-transform: uppercase; +} diff --git a/assets/style.scss b/assets/style.scss index fb87af5..b1c44b0 100644 --- a/assets/style.scss +++ b/assets/style.scss @@ -1,5 +1,6 @@ @import 'fonts'; @import 'colors'; +@import 'mixins'; * { font-family: Montserrat, sans-serif; @@ -22,8 +23,11 @@ header { } main { + width: 100%; max-width: 1200px; margin: auto; + + flex-grow: 1; } footer { @@ -37,9 +41,7 @@ h1, h2, h3, h4, h5, h6, p { } h1, h2, h3, h4, h5, h6 { - font-family: Orbitron, sans-serif; - font-weight: 900; - text-transform: uppercase; + @include heading; } h1 { @@ -64,10 +66,6 @@ figure { } } -.wrapper { - flex: 1; -} - .nav { max-width: 1200px; margin: 0 auto; @@ -91,9 +89,8 @@ figure { } .nav-logo { - font-family: Orbitron, sans-serif; - font-weight: 900; - text-transform: uppercase; + @include heading; + margin: 0 auto; @media screen and (min-width: 800px) { @@ -101,9 +98,9 @@ figure { } img { - width: 64px; + width: 48px; display: inline-block; - padding-right: 1em; + margin-right: 1em; vertical-align: middle; } } diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index b7fa5de..46e69c7 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -26,10 +26,8 @@ {{ end }} -
{{ block "main" . }} {{ end }} -
From a10c49c29891e8eb436999a422fb31b5b739deab Mon Sep 17 00:00:00 2001 From: Luca Date: Tue, 24 Nov 2020 21:33:12 +0100 Subject: [PATCH 2/7] Define breakpoints --- assets/_breakpoints.scss | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 assets/_breakpoints.scss diff --git a/assets/_breakpoints.scss b/assets/_breakpoints.scss new file mode 100644 index 0000000..09dbf87 --- /dev/null +++ b/assets/_breakpoints.scss @@ -0,0 +1,2 @@ +$small: 800px; +$large: 1200px; From ab1ac3fc32d95a41fd1df36a28159ef537a04bfa Mon Sep 17 00:00:00 2001 From: Luca Date: Tue, 24 Nov 2020 21:34:40 +0100 Subject: [PATCH 3/7] Rename 'program' to 'schedule' --- content/{program.de.md => schedule.de.md} | 2 +- content/{program.md => schedule.md} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename content/{program.de.md => schedule.de.md} (83%) rename content/{program.md => schedule.md} (75%) diff --git a/content/program.de.md b/content/schedule.de.md similarity index 83% rename from content/program.de.md rename to content/schedule.de.md index 4bba9ad..85cc23d 100644 --- a/content/program.de.md +++ b/content/schedule.de.md @@ -2,7 +2,7 @@ title: Programm menu: main: - weight: 3 + weight: 4 --- Das Programm erscheint in Kürze. diff --git a/content/program.md b/content/schedule.md similarity index 75% rename from content/program.md rename to content/schedule.md index 5722853..f79b39c 100644 --- a/content/program.md +++ b/content/schedule.md @@ -1,8 +1,8 @@ --- -title: Program +title: Schedule menu: main: - weight: 3 + weight: 4 --- The schedule for the franconian.net channel will be released shortly. From 9747489f3e03f9c965080c7908f32e59a1ef3f10 Mon Sep 17 00:00:00 2001 From: Luca Date: Tue, 24 Nov 2020 21:40:18 +0100 Subject: [PATCH 4/7] Update main menu weights --- content/_index.de.md | 5 ++++- content/_index.md | 5 ++++- content/about.de.md | 2 +- content/about.md | 2 +- content/faq.de.md | 2 +- content/faq.md | 2 +- content/imprint.de.md | 1 + content/imprint.md | 1 + 8 files changed, 14 insertions(+), 6 deletions(-) diff --git a/content/_index.de.md b/content/_index.de.md index fe7a783..830a0e3 100644 --- a/content/_index.de.md +++ b/content/_index.de.md @@ -1,5 +1,8 @@ --- -title: franconian.net +title: Startseite +menu: + main: + weight: 1 --- {{`Ein}} diff --git a/content/_index.md b/content/_index.md index 0989227..c3234aa 100644 --- a/content/_index.md +++ b/content/_index.md @@ -1,5 +1,8 @@ --- -title: franconian.net +title: Home +menu: + main: + weight: 1 --- {{`A}} diff --git a/content/about.de.md b/content/about.de.md index 9c51219..4768e54 100644 --- a/content/about.de.md +++ b/content/about.de.md @@ -2,7 +2,7 @@ title: Über uns menu: main: - weight: 2 + weight: 3 --- 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 diff --git a/content/about.md b/content/about.md index 0d8a456..fe7e9c0 100644 --- a/content/about.md +++ b/content/about.md @@ -2,7 +2,7 @@ title: About us menu: main: - weight: 2 + weight: 3 --- 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 diff --git a/content/faq.de.md b/content/faq.de.md index ad98001..67ae304 100644 --- a/content/faq.de.md +++ b/content/faq.de.md @@ -2,7 +2,7 @@ title: FAQ menu: main: - weight: 1 + weight: 2 --- #### Was ist die Antwort auf die Frage nach dem Leben, dem Universum und dem ganzen Rest? diff --git a/content/faq.md b/content/faq.md index 8207317..29d7d55 100644 --- a/content/faq.md +++ b/content/faq.md @@ -2,7 +2,7 @@ title: FAQ menu: main: - weight: 1 + weight: 2 --- #### What is "The Answer to the Ultimate Question of Life, the Universe, and Everything"? diff --git a/content/imprint.de.md b/content/imprint.de.md index 7af56e7..3ca6f5a 100644 --- a/content/imprint.de.md +++ b/content/imprint.de.md @@ -1,5 +1,6 @@ --- title: Impressum +menu: footer --- backspace e. V. diff --git a/content/imprint.md b/content/imprint.md index 844ed27..c4267c8 100644 --- a/content/imprint.md +++ b/content/imprint.md @@ -1,5 +1,6 @@ --- title: Imprint +menu: footer --- backspace e. V. From 5cdd38fcafc6b9abae9bf8463544f68abbcde45a Mon Sep 17 00:00:00 2001 From: Luca Date: Tue, 24 Nov 2020 21:44:16 +0100 Subject: [PATCH 5/7] Improve style sheet --- assets/style.scss | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/assets/style.scss b/assets/style.scss index b1c44b0..6636ff2 100644 --- a/assets/style.scss +++ b/assets/style.scss @@ -1,5 +1,6 @@ -@import 'fonts'; +@import 'breakpoints'; @import 'colors'; +@import 'fonts'; @import 'mixins'; * { @@ -24,8 +25,8 @@ header { main { width: 100%; - max-width: 1200px; - margin: auto; + max-width: $large; + margin: 0 auto; flex-grow: 1; } @@ -48,10 +49,6 @@ h1 { border-bottom: 2px $text-color solid; } -a { - text-decoration: none; -} - figure { margin-bottom: 1rem; @@ -67,21 +64,14 @@ figure { } .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) { - flex-direction: row; - - hr { - margin: 0 0.5em !important; - align-self: center; - } + &.nav-main { + max-width: $large; + margin: 0 auto; + padding: 0.5em; } hr { @@ -90,19 +80,20 @@ figure { .nav-logo { @include heading; + text-decoration: none; margin: 0 auto; - @media screen and (min-width: 800px) { - margin-left: 0; - } - img { width: 48px; display: inline-block; margin-right: 1em; vertical-align: middle; } + + @media screen and (min-width: $small) { + margin-left: 0; + } } .nav-link { @@ -112,4 +103,13 @@ figure { &.nav-link-active { } } + + @media screen and (min-width: $small) { + flex-direction: row; + + hr { + margin: 0 0.5em; + align-self: center; + } + } } From dbf189fa0251c5cad834e72f265748dc7cd5050c Mon Sep 17 00:00:00 2001 From: Luca Date: Tue, 24 Nov 2020 21:50:02 +0100 Subject: [PATCH 6/7] Add page title to window title, last modification time (according to Git) to footer --- assets/style.scss | 16 +++++++++++++++- config.toml | 1 + i18n/de.toml | 4 ++-- i18n/en.toml | 4 ++-- layouts/_default/baseof.html | 13 +++++++++---- 5 files changed, 29 insertions(+), 9 deletions(-) diff --git a/assets/style.scss b/assets/style.scss index 6636ff2..6a7a478 100644 --- a/assets/style.scss +++ b/assets/style.scss @@ -32,8 +32,22 @@ main { } 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 { diff --git a/config.toml b/config.toml index 6fe15ae..c0f08a5 100644 --- a/config.toml +++ b/config.toml @@ -1,5 +1,6 @@ baseURL = "https://www.franconian.net/" title = "franconian.net" +enableGitInfo = true [languages] [languages.en] diff --git a/i18n/de.toml b/i18n/de.toml index 64a1d7f..2fd661c 100644 --- a/i18n/de.toml +++ b/i18n/de.toml @@ -1,2 +1,2 @@ -[imprint] -other = "Impressum" +[last_change] +other = "Zuletzt geändert" diff --git a/i18n/en.toml b/i18n/en.toml index 94348fa..e62930e 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -1,2 +1,2 @@ -[imprint] -other = "Imprint" +[last_change] +other = "Last update" diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 46e69c7..1f00b02 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -4,7 +4,7 @@ {{ block "title" . }} - {{ .Site.Title }} + {{ .Title }} | {{ .Site.Title }} {{ end }} {{ $style := resources.Get "style.scss" | resources.ToCSS (dict "outputStyle" "compressed") }} @@ -12,8 +12,8 @@
-