diff --git a/assets/custom.css b/assets/custom.css deleted file mode 100644 index d067130..0000000 --- a/assets/custom.css +++ /dev/null @@ -1,9 +0,0 @@ -.centered { - margin: 0 auto; - text-align: center; -} - -dl dt, -dl dd { - margin-bottom: .25em; -} diff --git a/assets/favicon.png b/assets/favicon.png index 61d5849..65ae0a0 100644 Binary files a/assets/favicon.png and b/assets/favicon.png differ diff --git a/assets/logo.png b/assets/logo.png index 7747ffd..f97412f 100644 Binary files a/assets/logo.png and b/assets/logo.png differ diff --git a/assets/logo.svg b/assets/logo.svg new file mode 100644 index 0000000..4a4ea4a --- /dev/null +++ b/assets/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/config.yaml b/config.yaml index 81e456e..c08517f 100644 --- a/config.yaml +++ b/config.yaml @@ -38,7 +38,7 @@ params: # Favicon file (relative to baseURL - place below static or assets folder) favicon: favicon.png # Custom css file (relative to baseURL - place below static or assets folder) - css: custom.css + # css: custom.css # Define formatting of dates # (optional, falls back to RFC822 format if not set) @@ -53,7 +53,7 @@ params: # Header with title/subtitle can be disabled here. # (If you disable this, add some link on the index page inside menu.main, # otherwise your visitors will get confused and lost...) - showNavHeader: false + showNavHeader: true # Decide if only summaries are shown on the main page or the full content showFullContent: true diff --git a/content/dezentrale.md b/content/dezentrale.md index ae8d9be..1523411 100644 --- a/content/dezentrale.md +++ b/content/dezentrale.md @@ -1,150 +1,117 @@ --- -title: Dezentrale -slug: dezentrale -url: '/' +title: dezentrale +slug: null +url: / description: dezentrale. Hackspace. type: root draft: false -menu: main -weight: 10 showmeta: false showmetadates: false showmetalinks: false --- -{{< resource_image src="logo.png" alt="Logo" >}} +{{< full_logo >}} + +{{< page_row >}} +{{< page_col centered >}} + +## Hardware -
-
-

Hardware

-
Hardware kann repariert, zerlegt und wieder neu zusammen gesetzt werden. Der Drucker muss kein Bürogerät bleiben, ein alter Bildschirm kann Kunst werden. -
-
-
-

Netzpolitik

-
+ +{{< /page_col >}} +{{< page_col centered >}} + +## Netzpolitik + Die Auswirkungen der Digitalisierung auf die Gesellschaft werden immer Umfassender. Eine kritische Auseinandersetzung mit den Potenzialen und Gefahren der sich ausbildenden Informationsgesellschaft ist notwendig. -
-
-
+{{< /page_col >}} +{{< page_col centered >}} + +## Soziales -
-
-

Soziales

-
Zusammen etwas zu verwirklichen ist eine gute Sache. Sich auszutauschen und voneinander zu lernen bringt am Ende alle weiter, und sogar Minecraft macht gemeinsam mehr Spaß. -
-
-
-

Software

-
+ +{{< /page_col >}} +{{< page_col centered >}} + +## Software + Wenn die Programme unser Umfeld strukturieren, sollten wir diejenigen sein, die sie schreiben. -
-
-
+{{< /page_col >}} +{{< page_col centered >}} -
+## Projekte +[{{< value "links" "ffle_name" >}}]({{< value "links" "ffle_href" >}}) +\ +[{{< value "links" "hw4f_name" >}}]({{< value "links" "hw4f_href" >}}) +\ +[{{< value "links" "techniksprechstunde_name" >}}]({{< value "links" "techniksprechstunde_href" >}}) -
-
-

Projekte

-
- }}"> - {{< value "links" "ffle_name" >}} - -
-
- }}"> - {{< value "links" "hw4f_name" >}} - -
-
- }}"> - {{< value "links" "techniksprechstunde_name" >}} - -
-
-
-

Dokumente

-
- Satzung -
-
- Geschäftsordnung -
-
- Hygienekonzept -
-
-
+{{< /page_col >}} +{{< page_col centered >}} +## Dokumente -
-
-

Telefon

-
- }}"> - {{< value "phone" "landline_number" >}} - -
-
- }}"> - {{< value "phone" "mobile_number" >}} - -
-
-
-

Listen

-
- }}"> - {{< value "links" "lists_name" >}} - -
-
-
+[Satzung](/docs/dezentrale-satzung.pdf) +\ +[Geschäftsordnung](/docs/dezentrale-geschaeftsordnung.pdf) +\ +[Hygienekonzept](/docs/dezentrale-hygienekonzept.pdf) +{{< /page_col >}} +{{< page_col centered >}} -
-
-

Chat

-
- }}"> +### Telefon + +[{{< value "phone" "landline_number" >}}]({{< value "phone" "landline_href" >}}) +\ +[{{< value "phone" "mobile_number" >}}]({{< value "phone" "mobile_href" >}}) + +{{< /page_col >}} +{{< page_col centered >}} + +### Listen + +[{{< value "links" "lists_name" >}}]({{< value "links" "lists_href" >}}) + +{{< /page_col >}} +{{< page_col centered >}} + +### Chat + +[ {{< value "chat" "matrix_space" >}} — {{< value "chat" "matrix_server" >}} - -
-
- }}"> +]({{< value "chat" "matrix_space_href" >}}) +\ +[ {{< value "chat" "matrix_channel" >}} — {{< value "chat" "matrix_server" >}} - +]({{< value "chat" "matrix_channel_href" >}}) -
-
-
-

Adresse

-
- }}"> +{{< /page_col >}} +{{< page_col centered >}} + +### Adresse + +[ {{< value "address" "street_number" >}} — {{< value "address" "zip_city" >}} - -
-
-
+]({{< value "address" "osm_href" >}}) - -
+{{< /page_col >}} +{{< /page_row >}} diff --git a/layouts/shortcodes/full_logo.html b/layouts/shortcodes/full_logo.html new file mode 100644 index 0000000..bd52b58 --- /dev/null +++ b/layouts/shortcodes/full_logo.html @@ -0,0 +1,12 @@ +{{- $svg := resources.Get "logo.svg" | resources.Fingerprint }} +{{- $png := resources.Get "logo.png" | resources.Fingerprint }} +{{- $cls := "pure-img centered" }} +
+
+

+ + dezentrale logo + +

+
+
diff --git a/layouts/shortcodes/page_col.html b/layouts/shortcodes/page_col.html new file mode 100644 index 0000000..b58126e --- /dev/null +++ b/layouts/shortcodes/page_col.html @@ -0,0 +1,8 @@ +{{- $content := .Inner }} +{{- if not $content }} +{{- errorf "missing content for column: %s" .Position }} +{{- end }} +{{- $centered := cond (default true (.Get "centered")) " centered" "" }} +
+{{ markdownify $content }} +
diff --git a/layouts/shortcodes/page_row.html b/layouts/shortcodes/page_row.html new file mode 100644 index 0000000..271f971 --- /dev/null +++ b/layouts/shortcodes/page_row.html @@ -0,0 +1,7 @@ +{{- $content := .Inner }} +{{- if not $content }} +{{- errorf "missing content for row: %s" .Position }} +{{- end }} +
+{{ markdownify $content }} +
diff --git a/layouts/shortcodes/resource_image.html b/layouts/shortcodes/resource_image.html deleted file mode 100644 index 861a7c4..0000000 --- a/layouts/shortcodes/resource_image.html +++ /dev/null @@ -1,12 +0,0 @@ -{{- $src := default (.Get 0) (.Get "src") }} -{{- if not $src }} -{{- errorf "missing value for 'src': %s" .Position }} -{{- end }} -{{- $alt := default (.Get 1) (.Get "alt") }} -{{- if not $alt }} -{{- errorf "missing value for 'alt': %s" .Position }} -{{- end }} -{{- $img := resources.Get $src | resources.Fingerprint }} -

- {{ $alt }} -

diff --git a/themes/slick b/themes/slick index 96e0577..6adf382 160000 --- a/themes/slick +++ b/themes/slick @@ -1 +1 @@ -Subproject commit 96e0577b1afd94b5c12bbf3beba040d6fd40e216 +Subproject commit 6adf382f89a8ea89e95f05f5c0acd07c8b70d6dd