diff --git a/content/_index.md b/content/_index.md index b45810f..5138385 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](https://www.daswohnzimmer.com/drinks) (auch Mate!) +- Getränke und Snacks der Bar (auch Mate!) - Sofas - 3D-Drucker, diverses Werkzeug diff --git a/static/main.css b/static/main.css index b74f590..567c377 100644 --- a/static/main.css +++ b/static/main.css @@ -29,9 +29,10 @@ } body { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", - "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", - sans-serif; + margin: 0; + 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; @@ -40,11 +41,8 @@ body { background-color: var(--main-bg-color); color: var(--main-text-color); - /* 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; + margin: 3rem; + margin-top: 0; } a { @@ -167,7 +165,8 @@ 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; @@ -269,7 +268,9 @@ 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 { @@ -282,8 +283,6 @@ nav { /* main grid */ main { - flex: 1; - display: grid; grid-template: ". content ." auto / 1fr minmax(min-content, 45rem) 1fr; @@ -303,7 +302,6 @@ 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 deleted file mode 100644 index 3b6fffb..0000000 --- a/templates/404.html +++ /dev/null @@ -1,6 +0,0 @@ -{% 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 35c6677..4fd7b17 100644 --- a/templates/page.html +++ b/templates/page.html @@ -1,4 +1,4 @@ - + {% if page.title %} {% set title = page.title %} @@ -22,11 +22,6 @@ {% else %} {% set description = "" %} {% endif %} - - -{% if page.content %} {% set content = page.content %} - -{% endif %} @@ -106,16 +101,8 @@
- - {% block content %} - - {% if section %} {{ section.content | safe }} - - {% else %} {{ page.content | safe }} - - {% endif %} - - {% endblock content %} + {% if section %} {{ section.content | safe }} {% else %} {{ page.content + | safe }} {% endif %}