diff --git a/content/_index.md b/content/_index.md index 5138385..b45810f 100644 --- a/content/_index.md +++ b/content/_index.md @@ -32,7 +32,7 @@ Weitere Treffen finden nach Bedarf meist sonntags statt. Tagesordnungen, Protoko Logo von Freifunk Backnang -- Getränke und Snacks der Bar (auch Mate!) +- [Getränke und Snacks der Bar](https://www.daswohnzimmer.com/drinks) (auch Mate!) - Sofas - 3D-Drucker, diverses Werkzeug diff --git a/static/main.css b/static/main.css index 567c377..b74f590 100644 --- a/static/main.css +++ b/static/main.css @@ -29,10 +29,9 @@ } body { - margin: 0; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", - "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", - "Helvetica Neue", sans-serif; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", + "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", + sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -41,8 +40,11 @@ body { background-color: var(--main-bg-color); color: var(--main-text-color); - margin: 3rem; - margin-top: 0; + /* allows the footer to always snap to bottom of page, even if the content is shorter */ + margin: 0 3rem; + display: flex; + flex-direction: column; + min-height: 100vh; } a { @@ -165,8 +167,7 @@ header { } nav { - transition: - max-height 0.2s cubic-bezier(0.86, 0, 0.07, 1), + transition: max-height 0.2s cubic-bezier(0.86, 0, 0.07, 1), margin 0.2s cubic-bezier(0.86, 0, 0.07, 1); overflow-y: hidden; height: auto; @@ -268,9 +269,7 @@ nav { margin-bottom: 0.4em; text-transform: uppercase; text-decoration: underline 0.15em var(--main-text-color); - transition: - text-decoration-color 0.3s, - color 0.25s; + transition: text-decoration-color 0.3s, color 0.25s; &:focus, &:hover { @@ -283,6 +282,8 @@ nav { /* main grid */ main { + flex: 1; + display: grid; grid-template: ". content ." auto / 1fr minmax(min-content, 45rem) 1fr; @@ -302,6 +303,7 @@ footer { text-align: center; padding-top: 1.5em; margin-top: 1.5em; + margin-bottom: 1.5em; font-weight: bold; border-top: 2px solid transparent; border-image: linear-gradient( diff --git a/templates/404.html b/templates/404.html new file mode 100644 index 0000000..3b6fffb --- /dev/null +++ b/templates/404.html @@ -0,0 +1,6 @@ +{% extends "page.html" %} + +{% block content %} +

404 Unavailable for URL Reasons

+

Diese Seite gibt es nicht. Vielleicht ist sie im Cyber verschwunden. Zurück zur Startseite.

+{% endblock content %} diff --git a/templates/page.html b/templates/page.html index 4fd7b17..35c6677 100644 --- a/templates/page.html +++ b/templates/page.html @@ -1,4 +1,4 @@ - + {% if page.title %} {% set title = page.title %} @@ -22,6 +22,11 @@ {% else %} {% set description = "" %} {% endif %} + + +{% if page.content %} {% set content = page.content %} + +{% endif %} @@ -101,8 +106,16 @@
- {% if section %} {{ section.content | safe }} {% else %} {{ page.content - | safe }} {% endif %} + + {% block content %} + + {% if section %} {{ section.content | safe }} + + {% else %} {{ page.content | safe }} + + {% endif %} + + {% endblock content %}