Merge pull request 'Refactor layout & log' (#81) from layout into main
Reviewed-on: #81
This commit is contained in:
commit
b77af0ac1c
|
@ -1,9 +0,0 @@
|
|||
.centered {
|
||||
margin: 0 auto;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
dl dt,
|
||||
dl dd {
|
||||
margin-bottom: .25em;
|
||||
}
|
Binary file not shown.
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 16 KiB |
BIN
assets/logo.png
BIN
assets/logo.png
Binary file not shown.
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 13 KiB |
File diff suppressed because one or more lines are too long
After Width: | Height: | Size: 14 KiB |
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
<div class="pure-g">
|
||||
<div class="pure-u-1-2 centered">
|
||||
<h2>Hardware</h2>
|
||||
<div>
|
||||
Hardware kann repariert, zerlegt und wieder neu zusammen gesetzt werden.
|
||||
Der Drucker muss kein Bürogerät bleiben, ein alter Bildschirm
|
||||
kann Kunst werden.
|
||||
</div>
|
||||
</div>
|
||||
<div class="pure-u-1-2 centered">
|
||||
<h2>Netzpolitik</h2>
|
||||
<div>
|
||||
|
||||
{{< /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.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{< /page_col >}}
|
||||
{{< page_col centered >}}
|
||||
|
||||
## Soziales
|
||||
|
||||
<div class="pure-g">
|
||||
<div class="pure-u-1-2 centered">
|
||||
<h2>Soziales</h2>
|
||||
<div>
|
||||
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ß.
|
||||
</div>
|
||||
</div>
|
||||
<div class="pure-u-1-2 centered">
|
||||
<h2>Software</h2>
|
||||
<div>
|
||||
|
||||
{{< /page_col >}}
|
||||
{{< page_col centered >}}
|
||||
|
||||
## Software
|
||||
|
||||
Wenn die Programme unser Umfeld strukturieren, sollten wir diejenigen sein,
|
||||
die sie schreiben.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{< /page_col >}}
|
||||
{{< page_col centered >}}
|
||||
|
||||
<br>
|
||||
## 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" >}})
|
||||
|
||||
<div class="pure-g">
|
||||
<div class="pure-u-1-2 centered">
|
||||
<h2>Projekte</h2>
|
||||
<div>
|
||||
<a href="{{< value "links" "ffle_href" >}}">
|
||||
{{< value "links" "ffle_name" >}}
|
||||
</a>
|
||||
</div>
|
||||
<div>
|
||||
<a href="{{< value "links" "hw4f_href" >}}">
|
||||
{{< value "links" "hw4f_name" >}}
|
||||
</a>
|
||||
</div>
|
||||
<div>
|
||||
<a href="{{< value "links" "techniksprechstunde_href" >}}">
|
||||
{{< value "links" "techniksprechstunde_name" >}}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="pure-u-1-2 centered">
|
||||
<h2>Dokumente</h2>
|
||||
<div>
|
||||
<a href="/docs/dezentrale-satzung.pdf">Satzung</a>
|
||||
</div>
|
||||
<div>
|
||||
<a href="/docs/dezentrale-geschaeftsordnung.pdf">Geschäftsordnung</a>
|
||||
</div>
|
||||
<div>
|
||||
<a href="/docs/dezentrale-hygienekonzept.pdf">Hygienekonzept</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{{< /page_col >}}
|
||||
{{< page_col centered >}}
|
||||
|
||||
## Dokumente
|
||||
|
||||
<div class="pure-g">
|
||||
<div class="pure-u-1-2 centered">
|
||||
<h3>Telefon</h3>
|
||||
<div>
|
||||
<a href="{{< value "phone" "landline_href" >}}">
|
||||
{{< value "phone" "landline_number" >}}
|
||||
</a>
|
||||
</div>
|
||||
<div>
|
||||
<a href="{{< value "phone" "mobile_href" >}}">
|
||||
{{< value "phone" "mobile_number" >}}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="pure-u-1-2 centered">
|
||||
<h3>Listen</h3>
|
||||
<div>
|
||||
<a href="{{< value "links" "lists_href" >}}">
|
||||
{{< value "links" "lists_name" >}}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
[Satzung](/docs/dezentrale-satzung.pdf)
|
||||
\
|
||||
[Geschäftsordnung](/docs/dezentrale-geschaeftsordnung.pdf)
|
||||
\
|
||||
[Hygienekonzept](/docs/dezentrale-hygienekonzept.pdf)
|
||||
|
||||
{{< /page_col >}}
|
||||
{{< page_col centered >}}
|
||||
|
||||
<div class="pure-g">
|
||||
<div class="pure-u-1-2 centered">
|
||||
<h3>Chat</h3>
|
||||
<div>
|
||||
<a href="{{< value "chat" "matrix_space_href" >}}">
|
||||
### 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" >}}
|
||||
</a>
|
||||
</div>
|
||||
<div>
|
||||
<a href="{{< value "chat" "matrix_channel_href" >}}">
|
||||
]({{< value "chat" "matrix_space_href" >}})
|
||||
\
|
||||
[
|
||||
{{< value "chat" "matrix_channel" >}}
|
||||
—
|
||||
{{< value "chat" "matrix_server" >}}
|
||||
</a>
|
||||
]({{< value "chat" "matrix_channel_href" >}})
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="pure-u-1-2 centered">
|
||||
<h3>Adresse</h3>
|
||||
<div>
|
||||
<a href="{{< value "address" "osm_href" >}}">
|
||||
{{< /page_col >}}
|
||||
{{< page_col centered >}}
|
||||
|
||||
### Adresse
|
||||
|
||||
[
|
||||
{{< value "address" "street_number" >}}
|
||||
—
|
||||
{{< value "address" "zip_city" >}}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
]({{< value "address" "osm_href" >}})
|
||||
|
||||
|
||||
<br>
|
||||
{{< /page_col >}}
|
||||
{{< /page_row >}}
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
{{- $svg := resources.Get "logo.svg" | resources.Fingerprint }}
|
||||
{{- $png := resources.Get "logo.png" | resources.Fingerprint }}
|
||||
{{- $cls := "pure-img centered" }}
|
||||
<div class="pure-g">
|
||||
<div class="pure-u-3-4 pure-u-md-2-3 centered">
|
||||
<p>
|
||||
<object class="{{ $cls }}" type="image/svg+xml" data="{{ $svg.Permalink }}">
|
||||
<img class="{{ $cls }}" src="{{ $png.Permalink }}" alt="dezentrale logo" />
|
||||
</object>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
|
@ -0,0 +1,8 @@
|
|||
{{- $content := .Inner }}
|
||||
{{- if not $content }}
|
||||
{{- errorf "missing content for column: %s" .Position }}
|
||||
{{- end }}
|
||||
{{- $centered := cond (default true (.Get "centered")) " centered" "" }}
|
||||
<div class="pure-u-1-1 pure-u-md-1-2{{ $centered }}">
|
||||
{{ markdownify $content }}
|
||||
</div>
|
|
@ -0,0 +1,7 @@
|
|||
{{- $content := .Inner }}
|
||||
{{- if not $content }}
|
||||
{{- errorf "missing content for row: %s" .Position }}
|
||||
{{- end }}
|
||||
<div class="pure-g">
|
||||
{{ markdownify $content }}
|
||||
</div>
|
|
@ -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 }}
|
||||
<p>
|
||||
<img class="centered" src="{{ $img.RelPermalink }}" alt="{{ $alt }}">
|
||||
</p>
|
|
@ -1 +1 @@
|
|||
Subproject commit 96e0577b1afd94b5c12bbf3beba040d6fd40e216
|
||||
Subproject commit 6adf382f89a8ea89e95f05f5c0acd07c8b70d6dd
|
Reference in New Issue