diff --git a/lektor/lektordata/project/assets/static/style.css b/lektor/lektordata/project/assets/static/style.css index dbd76c9..209047b 100644 --- a/lektor/lektordata/project/assets/static/style.css +++ b/lektor/lektordata/project/assets/static/style.css @@ -67,7 +67,71 @@ body { } a { +<<<<<<< HEAD text-decoration: none; +======= + color: #b78c66; + text-decoration: none +} + +td,th { + padding: 5px 15px +} + +div.page,footer,header { + position: relative; + width: 80%; + margin: 0 auto; + background: #ececec; + max-width: 1200px +} + +div.page { + color: #6c7d8c; +} + +div.page>div.inner_page,footer>div.inner_footer,header>div.inner_header { + padding: 20px 30px; +} + +div.inner_page > * { + margin: 0; + padding:0 ; +} + + +body,div.page h1, div.page h2, div.page h3, div.page h4, div.page h5, div.page h6 { + color: #5d5d5d; + padding: 20px 30px; + margin: 0; +} + +body,div.inner_page h1, div.inner_page h2, div.inner_page h3, div.inner_page h4, div.inner_page h5, div.inner_page h6 { + color: #5d5d5d; + padding: 0; +} + + +div.inner_page { + position: relative; + top: 0; + padding: 0 +} + +div.inner_page.bgimage { + background-image: url(/images/bg_image_welcome_1.jpg); + background-size: 100%; + background-position: top; + background-repeat: no-repeat; + background-color: rgba(255,255,255,.6); + background-blend-mode: lighten; + min-height: 672px; + box-sizing: border-box +} + +footer,header,header h1 { + color: #b0b0b0 +>>>>>>> 4a6b860 (Wooohaaa! Look! I did magic: I converted a list into a table. How beautiful ist that?) } header { @@ -140,6 +204,7 @@ li { color: #f00; } +<<<<<<< HEAD .right_header .nav li { margin: 0 20px; } @@ -363,6 +428,67 @@ div.left_footer, div.middle_footer, div.right_footer { } div.left_footer, div.middle_footer, div.right_footer { padding: calc(28px * 0.7); +======= + + +.termine *{ + box-sizing: border-box; +} + + +.termine ul { + list-style: none; + padding: 0; + margin: 0; +} + +.termine li { + display: flex; + margin-bottom: 10px; +} + + +.termine ul > li { + font-weight: bold; + width: 1000px; +} +.termine ul > li > div { + width: 500px; + font-size: 0.75vw; +} + + +.termine ul > li > ul > li { + width: 175px; +} + +.termine ul > li > ul > li:nth-child(1){ + width: 250px; +} + +.termine ul > li > ul > li:nth-child(2){ + width: 75px; +} + +.termine ul > li > ul { + display: flex; + padding-left: 0; + margin-left: 0; +} + +.termine ul > li > ul > li { + margin-right: 0; +} + +.termine ul > li > ul > li > div{ + font-size: 0.75vw; +} + + +@media (max-width:768px) { + header h1 { + font-size: 3.15vw +>>>>>>> 4a6b860 (Wooohaaa! Look! I did magic: I converted a list into a table. How beautiful ist that?) } diff --git a/lektor/lektordata/project/content/about/contents.lr b/lektor/lektordata/project/content/about/contents.lr index d8d96a8..e9c08b8 100644 --- a/lektor/lektordata/project/content/about/contents.lr +++ b/lektor/lektordata/project/content/about/contents.lr @@ -34,3 +34,5 @@ Ob im Training oder an Schützenfesten, überall sind Mitglieder des Pistolenclu | **2010** | | Einbau künstliche Kugelfänge System Leu + Helfenstein.
Umbau 50m Zugscheibenanlage von System Schmalz Uster auf System Leu + Helfenstein.
Einbau neuer Motoren und Steuerung. | | | | | | **2015** | | Einbau Schallschutzwände standseitig und Verkleidung der Hochblende mit Schalldämmplatten. | +--- +_template: page.html diff --git a/lektor/lektordata/project/content/termine/contents.lr b/lektor/lektordata/project/content/termine/contents.lr index dbdfe0c..c077d7c 100644 --- a/lektor/lektordata/project/content/termine/contents.lr +++ b/lektor/lektordata/project/content/termine/contents.lr @@ -53,3 +53,6 @@ body: *
18:00
  *
 
  +--- +_template: termine_page.html + diff --git a/lektor/lektordata/project/content/vorstand/contents.lr b/lektor/lektordata/project/content/vorstand/contents.lr index 050136e..ae422d5 100644 --- a/lektor/lektordata/project/content/vorstand/contents.lr +++ b/lektor/lektordata/project/content/vorstand/contents.lr @@ -12,3 +12,5 @@ body: | **Müller Konrad** | 1. Schützenmeister | schiesswesen@pc-stammertal.ch | | **Bollinger Reto** | Schützenmeister, Beisitz | beisitz@pc-stammertal.ch | | **Horvath Richard** | Schützenmeister, Fähnrich, Standwart | infrastruktur@pc-stammertal.ch | +--- +_template: page.html diff --git a/lektor/lektordata/project/templates/page.html b/lektor/lektordata/project/templates/page.html index 7cf77ef..8b861a2 100644 --- a/lektor/lektordata/project/templates/page.html +++ b/lektor/lektordata/project/templates/page.html @@ -1,8 +1,8 @@ {% extends "layout.html" %} {% block title %}{{ this.title }}{% endblock %} {% block body %} +

{{ this.title }}

-

{{ this.title }}

{{ this.body }}
{% endblock %} diff --git a/lektor/lektordata/project/templates/termine_page.html b/lektor/lektordata/project/templates/termine_page.html new file mode 100644 index 0000000..b6e8581 --- /dev/null +++ b/lektor/lektordata/project/templates/termine_page.html @@ -0,0 +1,8 @@ +{% extends "layout.html" %} +{% block title %}{{ this.title }}{% endblock %} +{% block body %} +

{{ this.title }}

+
+ {{ this.body }} +
+{% endblock %} diff --git a/lektor/lektordata/scripts/calendar-fetcher.sh b/lektor/lektordata/scripts/calendar-fetcher.sh index faf036f..6ab2f41 100755 --- a/lektor/lektordata/scripts/calendar-fetcher.sh +++ b/lektor/lektordata/scripts/calendar-fetcher.sh @@ -78,3 +78,6 @@ echo "$ICS_DATA" | awk 'BEGIN{FS=":"} }' | awk -v today="$TODAY" 'substr($1,1,8) >= today' | sort | cut -d " " -f 2- | sed 's@@\ \n@g' | sed '/^$/d' echo "" +echo "---" +echo "_template: termine_page.html" +echo ""