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; 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..2f00caa 100644 --- a/assets/style.scss +++ b/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; - margin: auto; + width: 100%; + 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; - font-weight: 900; - text-transform: uppercase; + @include heading; } 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) { - flex-direction: row; - - hr { - margin: 0 0.5em !important; - align-self: center; - } + &.nav-main { + max-width: $large; + margin: 0 auto; + padding: 0.5em; } hr { @@ -91,20 +93,20 @@ figure { } .nav-logo { - font-family: Orbitron, sans-serif; - font-weight: 900; - text-transform: uppercase; + @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; } - img { - width: 64px; - display: inline-block; - padding-right: 1em; - vertical-align: middle; + @media screen and (min-width: $small) { + margin-left: 0; } } @@ -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; + } + } } diff --git a/config.toml b/config.toml index 47be51c..e52a861 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/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..d265664 100644 --- a/content/about.de.md +++ b/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 diff --git a/content/about.md b/content/about.md index 0d8a456..1fe20eb 100644 --- a/content/about.md +++ b/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 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. diff --git a/content/news/_index.de.md b/content/news/_index.de.md index 7ec5bd0..58a19d2 100644 --- a/content/news/_index.de.md +++ b/content/news/_index.de.md @@ -2,6 +2,6 @@ title: News menu: main: - weight: 1 + weight: 2 --- diff --git a/content/news/_index.md b/content/news/_index.md index 7ec5bd0..58a19d2 100644 --- a/content/news/_index.md +++ b/content/news/_index.md @@ -2,6 +2,6 @@ title: News menu: main: - weight: 1 + weight: 2 --- 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 85cc23d..e332ec0 100644 --- a/content/program.de.md +++ b/content/schedule.de.md @@ -2,7 +2,7 @@ title: Programm menu: main: - weight: 4 + weight: 5 --- 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 38a1fb5..6639b7f 100644 --- a/content/program.md +++ b/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. 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 b7fa5de..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 @@
-
-
{{ block "main" . }} {{ end }} -