From b8df293a52ace827eff795e0a2d85e45c6b96d17 Mon Sep 17 00:00:00 2001 From: Patrick Neff Date: Mon, 6 May 2019 01:29:42 +0200 Subject: [PATCH] Update theme to use new layout system --- config.toml | 4 + content/_index.md | 1 + .../urnengrabanlage/abdeckung/modell.md | 37 - content/ueber-uns/_index.md | 8 + .../ueber-uns/handwerk/bilder/knuepfel.svg | 82 ++ .../{handwerk.md => handwerk/index.md} | 7 + .../ueber-uns/qualitaet/bilder/qualitaet.svg | 109 +++ .../{qualitaet.md => qualitaet/index.md} | 7 + content/ueber-uns/tradition/bilder/4w.svg | 41 + .../{tradition.md => tradition/index.md} | 7 + package-lock.json | 26 - themes/neff/layouts/_default/baseof.html | 153 ++- themes/neff/layouts/_default/single.html | 29 +- themes/neff/layouts/catalog/li.html | 2 +- themes/neff/layouts/catalog/list.html | 24 - themes/neff/layouts/catalog/single.html | 31 +- themes/neff/layouts/index.html | 60 +- themes/neff/layouts/model/single.html | 19 - themes/neff/layouts/partials/banner.html | 16 - .../layouts/partials/catalog-article.html | 20 - themes/neff/layouts/partials/catalog.html | 57 -- themes/neff/layouts/partials/figure.html | 48 +- themes/neff/layouts/partials/footer.html | 49 - themes/neff/layouts/partials/head.html | 18 - themes/neff/layouts/partials/header.html | 40 - themes/neff/layouts/partials/hero.html | 9 - themes/neff/layouts/partials/img.html | 22 +- themes/neff/layouts/partials/menu.html | 25 - themes/neff/layouts/partials/news.html | 20 - themes/neff/layouts/partials/scripts.html | 5 - themes/neff/layouts/partials/single.html | 22 - .../partials/{ => templates}/lightbox.html | 0 themes/neff/layouts/shortcodes/pagelist.html | 3 +- themes/neff/src/scss/_app.scss | 892 ++++++++++++++++++ themes/neff/src/scss/_banner.scss | 32 - themes/neff/src/scss/_content.scss | 3 - themes/neff/src/scss/_footer.scss | 45 - themes/neff/src/scss/_grid.scss | 431 --------- themes/neff/src/scss/_header.scss | 216 ----- themes/neff/src/scss/_index.scss | 62 -- themes/neff/src/scss/_list.scss | 5 - themes/neff/src/scss/_mixins.scss | 3 - themes/neff/src/scss/_single.scss | 58 -- themes/neff/src/scss/main.scss | 11 +- .../neff/src/vue/components/ModelViewer.vue | 3 + 45 files changed, 1449 insertions(+), 1313 deletions(-) delete mode 100644 content/katalog/urnengrabanlage/abdeckung/modell.md create mode 100644 content/ueber-uns/_index.md create mode 100755 content/ueber-uns/handwerk/bilder/knuepfel.svg rename content/ueber-uns/{handwerk.md => handwerk/index.md} (67%) create mode 100644 content/ueber-uns/qualitaet/bilder/qualitaet.svg rename content/ueber-uns/{qualitaet.md => qualitaet/index.md} (75%) create mode 100755 content/ueber-uns/tradition/bilder/4w.svg rename content/ueber-uns/{tradition.md => tradition/index.md} (78%) delete mode 100644 package-lock.json delete mode 100644 themes/neff/layouts/catalog/list.html delete mode 100644 themes/neff/layouts/model/single.html delete mode 100644 themes/neff/layouts/partials/banner.html delete mode 100755 themes/neff/layouts/partials/catalog-article.html delete mode 100644 themes/neff/layouts/partials/catalog.html delete mode 100755 themes/neff/layouts/partials/footer.html delete mode 100755 themes/neff/layouts/partials/head.html delete mode 100755 themes/neff/layouts/partials/header.html delete mode 100755 themes/neff/layouts/partials/hero.html delete mode 100755 themes/neff/layouts/partials/menu.html delete mode 100755 themes/neff/layouts/partials/news.html delete mode 100644 themes/neff/layouts/partials/scripts.html delete mode 100755 themes/neff/layouts/partials/single.html rename themes/neff/layouts/partials/{ => templates}/lightbox.html (100%) create mode 100644 themes/neff/src/scss/_app.scss delete mode 100644 themes/neff/src/scss/_banner.scss delete mode 100644 themes/neff/src/scss/_content.scss delete mode 100644 themes/neff/src/scss/_footer.scss delete mode 100644 themes/neff/src/scss/_grid.scss delete mode 100644 themes/neff/src/scss/_header.scss delete mode 100644 themes/neff/src/scss/_index.scss delete mode 100644 themes/neff/src/scss/_list.scss delete mode 100644 themes/neff/src/scss/_single.scss diff --git a/config.toml b/config.toml index 8baf476..0425ce1 100644 --- a/config.toml +++ b/config.toml @@ -18,6 +18,10 @@ pluralizeListTitles = false googleAnalytics = "UA-12671637-1" +[mediaTypes] + [mediaTypes."image/svg+xml"] + suffixes = ["svg"] + [menu] [[menu.main]] identifier = "ueber-uns" diff --git a/content/_index.md b/content/_index.md index 4329f40..4fd2888 100644 --- a/content/_index.md +++ b/content/_index.md @@ -4,6 +4,7 @@ draft = false title = "Neff Stein-Design" galleries = ["gemeinschaftsgrab", "grabmal", "bauen-und-wohnen"] +about_us = ["qualitaet", "tradition", "handwerk"] [menu] [menu.footer] diff --git a/content/katalog/urnengrabanlage/abdeckung/modell.md b/content/katalog/urnengrabanlage/abdeckung/modell.md deleted file mode 100644 index b780548..0000000 --- a/content/katalog/urnengrabanlage/abdeckung/modell.md +++ /dev/null @@ -1,37 +0,0 @@ -+++ -title = "Urnengrab Abdeckung" -date = "2019-05-02T06:30:55+02:00" -draft = false -alt = "Urnengrababdeckung mit Umrandung" -material = "PP4, poliert" -article_id = "0001" -ornament = "Kreuz" -description = "Urnengrab Abdeckplatte mit verklebter Einfassung" -offer = "/aktionen/preisbeispiel-urnengrab-2019/" -type = "model" -used_for = ["Urnengrab"] -keywords = [] -outputs = ["HTML", "JSON"] - -[[resources]] - title = "Test #:counter" - src = "bilder/abdeckung.png" - [resources.params] - alt = "Bild von einem Test" - featured = true - -[[resources]] - title = "Model" - src = "model/abdeckung.gltf" - [resources.params] - alt = "Bild von einem Test" - [[resources.params.textures]] - name = "Granit 1" - filename = "granit.jpg" - - [[resources.params.textures]] - name = "Granit 2" - filename = "1280px-Rosa-Beta-Granit.jpg" -+++ - -Hallo \ No newline at end of file diff --git a/content/ueber-uns/_index.md b/content/ueber-uns/_index.md new file mode 100644 index 0000000..0519320 --- /dev/null +++ b/content/ueber-uns/_index.md @@ -0,0 +1,8 @@ ++++ +title = "Über Uns" +date = "2019-01-10T02:27:09+01:00" +draft = false +type = "page" +keywords = [] +headless = true ++++ diff --git a/content/ueber-uns/handwerk/bilder/knuepfel.svg b/content/ueber-uns/handwerk/bilder/knuepfel.svg new file mode 100755 index 0000000..31039af --- /dev/null +++ b/content/ueber-uns/handwerk/bilder/knuepfel.svg @@ -0,0 +1,82 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/content/ueber-uns/handwerk.md b/content/ueber-uns/handwerk/index.md similarity index 67% rename from content/ueber-uns/handwerk.md rename to content/ueber-uns/handwerk/index.md index 8658b74..7c0ecd2 100644 --- a/content/ueber-uns/handwerk.md +++ b/content/ueber-uns/handwerk/index.md @@ -6,6 +6,13 @@ type = "ueber-uns" weight = -100 icon = "knuepfel" headless = true + +[[resources]] + title = "Handwerk" + src = "bilder/knuepfel.svg" + [resources.params] + alt = "Knüpfel, Zirkel und Meißel" + featured = true +++ Wir planen und fertigen Arbeiten aus Naturstein im Wohnbereich, wie zum diff --git a/content/ueber-uns/qualitaet/bilder/qualitaet.svg b/content/ueber-uns/qualitaet/bilder/qualitaet.svg new file mode 100644 index 0000000..ace52ba --- /dev/null +++ b/content/ueber-uns/qualitaet/bilder/qualitaet.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/content/ueber-uns/qualitaet.md b/content/ueber-uns/qualitaet/index.md similarity index 75% rename from content/ueber-uns/qualitaet.md rename to content/ueber-uns/qualitaet/index.md index b543290..bb2f9a1 100644 --- a/content/ueber-uns/qualitaet.md +++ b/content/ueber-uns/qualitaet/index.md @@ -6,6 +6,13 @@ type = "ueber-uns" weight = -300 icon = "qualitaet" headless = true + +[[resources]] + title = "Qualität" + src = "bilder/qualitaet.svg" + [resources.params] + alt = "" + featured = true +++ Eigene Ideen oder die unserer Kunden werden so umgesetzt, dass daraus diff --git a/content/ueber-uns/tradition/bilder/4w.svg b/content/ueber-uns/tradition/bilder/4w.svg new file mode 100755 index 0000000..961723f --- /dev/null +++ b/content/ueber-uns/tradition/bilder/4w.svg @@ -0,0 +1,41 @@ + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/content/ueber-uns/tradition.md b/content/ueber-uns/tradition/index.md similarity index 78% rename from content/ueber-uns/tradition.md rename to content/ueber-uns/tradition/index.md index 38c8a1c..38ffaad 100644 --- a/content/ueber-uns/tradition.md +++ b/content/ueber-uns/tradition/index.md @@ -6,6 +6,13 @@ type = "ueber-uns" weight = -200 icon = "4w" headless = true + +[[resources]] + title = "Tradition" + src = "bilder/4w.svg" + [resources.params] + alt = "4W - Das Symbol der Steinmetz Zunft" + featured = true +++ Die Firma wurde [um 1900](/firmengeschichte) in Niederkassel gegründet. Zu diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 1fce15b..0000000 --- a/package-lock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "requires": true, - "lockfileVersion": 1, - "dependencies": { - "three": { - "version": "0.104.0", - "resolved": "https://registry.npmjs.org/three/-/three-0.104.0.tgz", - "integrity": "sha512-q617IMBC5k40U2E9UC4/LtmhzTOOLB1jGMIooUL+QrhZ7abiGCSDrKrpCDt9V8RTl6xw+0FYfA1PYsIPKbQOgg==" - }, - "vue-3d-model": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/vue-3d-model/-/vue-3d-model-1.0.2.tgz", - "integrity": "sha512-AfuvlmMIJrzp5dsCdust2K/oEXVV/KjDZa1f4vfhWBjL7ZoVgy16u5JkY9qdCBoUsn5XQQmMW4zy5tHSAjhFXA==", - "requires": { - "three": "^0.88.0" - }, - "dependencies": { - "three": { - "version": "0.88.0", - "resolved": "https://registry.npmjs.org/three/-/three-0.88.0.tgz", - "integrity": "sha1-QlbC/Djk+yOg0j66K2zOTfjkZtU=" - } - } - } - } -} diff --git a/themes/neff/layouts/_default/baseof.html b/themes/neff/layouts/_default/baseof.html index d7694c7..65b5c1f 100755 --- a/themes/neff/layouts/_default/baseof.html +++ b/themes/neff/layouts/_default/baseof.html @@ -5,24 +5,95 @@ {{- block "title" . -}}{{- .Site.Title -}}{{- end -}} {{ .Hugo.Generator }} - {{- partial "head.html" . -}} + {{- partial "schema/site.html" . -}} + {{- if (and (eq .Kind "page") (eq .Type "news")) -}} + {{- partial "schema/post.html" . -}} + {{- end -}} + {{- if (and (eq .Kind "page") (ne .Type "news")) -}} + {{- partial "schema/article.html" . -}} + {{- end -}} + {{- if (eq .Kind "section") -}} + {{- partial "schema/collectionpage.html" . -}} + {{- end -}} + {{ partial "part/style.html" (dict "ctx" . "path" "css/style.css" )}} + + + + + + + {{- block "head" . -}}{{- end -}}