Fix merge conflict

Makefile

@@ -1,5 +1,7 @@
 THEME = neff
-REMOTE = dev.test:/var/www/neff-steindesign.dev.test
+LOCAL_DIR = /srv/http/staging
+REMOTE_DIR = /srv/http/live
+REMOTE = neff-steindesign.de@ssh.sterato.com:seiten/hugo
 
 HUGO = /usr/bin/hugo
 NPM = /usr/bin/npm
@@ -7,25 +9,42 @@ RSYNC = /usr/bin/rsync
 JPEGOPTIM = /usr/bin/jpegoptim
 OPTIPNG = /usr/bin/optipng
 
-.PHONY: all clean server jpegoptim optipng site staging
+.PHONY: all clean server jpegoptim optipng site staging theme upload
 .SUFFIXES: .jpg .png .md .html .js .css .scss .toml
 
 DIRS = content data static themes/$(THEME) resources
 
+HUGO_ARGS = --gc --minify 
+
+IP := $(shell hostname --ip-address)
+
 all: $(DIRS) public/*
 
 clean: 
 	rm -rf public/ resources/
 
+theme: 
+	$(NPM) --prefix="themes/$(THEME)" install --save-dev
+	$(NPM) --prefix="themes/$(THEME)" run build
+
 site: 
-	$(HUGO) --gc
+	$(HUGO) $(HUGO_ARGS) --destination $(REMOTE_DIR)
+
+local: 
+	$(HUGO) $(HUGO_ARGS) --baseURL http://$(IP) --destination $(LOCAL_DIR)
 
 staging: 
 	$(HUGO) --buildDrafts --buildExpired --buildFuture --gc
 
+upload:
+	$(RSYNC) -avz --delete $(REMOTE_DIR)/ $(REMOTE)
+
 server: themes/$(THEME)/package-lock.json themes/$(THEME)/src
 	$(HUGO) server --buildDrafts --buildExpired --buildFuture --gc
 
+upload:
+	$(RSYNC) -avz --delete public/ $(REMOTE)
+
 $(DIRS): themes/$(THEME)/package-lock.json themes/$(THEME)/src
 	$(HUGO) --gc
 
@@ -35,5 +54,5 @@ themes/$(THEME)/package-lock.json:
 themes/$(THEME)/src:
 	$(NPM) --prefix="themes/$(THEME)" run build
 
-public/*:
+upload:
 	$(RSYNC) -avz --delete public/ $(REMOTE)

config.toml

@@ -52,6 +52,7 @@ googleAnalytics = "UA-12671637-1"
     [[menu.footer]]
         identifier = "left"
         weight = -200
+        url = "#"
 
     [[menu.footer]]
         identifier = "copyright"
@@ -63,6 +64,7 @@ googleAnalytics = "UA-12671637-1"
     [[menu.footer]]
         identifier = "mid"
         weight = -100
+        url = "#"
 
     [[menu.footer]]
         identifier = "kontakt"
@@ -75,6 +77,7 @@ googleAnalytics = "UA-12671637-1"
     [[menu.footer]]
         identifier = "right"
         weight = 0
+        url = "#"
 
     [[menu.footer]]
         identifier = "sitemap"

content/galerie/kunstwerke/marienstatue-uckendorf/index.md

@@ -3,17 +3,64 @@ title = "Marienstatue Uckendorf"
 date = "2019-01-15T17:46:26+01:00"
 draft = true
 type = "gallery"
-alt = "Marienfigur in einer Nische des Südwestgiebels der Uckendorfer Pfarrkirche"
+alt = "Marienfigur in einer Nische des Südwestgiebels der Uckendorfer Pfarrkirche."
-description = "Marienfigur in einer Nische des Südwestgiebels der Uckendorfer Pfarrkirche"
+description = "Marienfigur in einer Nische des Südwestgiebels der Uckendorfer Pfarrkirche."
 keywords = []
 
 [[resources]]
-  title = "Marienstatue in Uckendorf"
+  title = "Beide Statuen nebeneinander"
-  src = "bilder/platzhalter.jpg"
+  src = "bilder/2-madonnen-nebeneinander.jpg"
   [resources.params]
-    alt = "Marienfigur in einer Nische des Südwestgiebels der Uckendorfer Pfarrkirche"
+    alt = "Die alte und neue Statue nebeneinander."
-    description = "Marienfigur in einer Nische des Südwestgiebels der Uckendorfer Pfarrkirche"
+    description = "Die alte und neue Statue nebeneinander in der Werkstatt."
-    featured = true
+
+[[resources]]
+  title = "Angezeichneter Rohblock"
+  src = "bilder/block-aufgezeichnet.jpg"
+  [resources.params]
+    alt = "Der Umriss der Marienfigur auf dem angeschnittenen Block aufgezeichnet."
+
+[[resources]]
+  title = "Alte madonna im Hof"
+  src = "bilder/madonna-alt-im-hof.jpg"
+  [resources.params]
+    alt = "Der Block aus dem die Marienstatue entstanden ist."
+
+[[resources]]
+  title = "Rohblock Angesägt"
+  src = "bilder/rohblock-angesaegt.jpg"
+  [resources.params]
+    alt = "Der angesägte Rohblock auf dem die Struktur des Materials zu erkennen ist."
+
+[[resources]]
+  title = "Rohblock"
+  src = "bilder/rohblock.jpg"
+  [resources.params]
+    alt = "Der Block aus dem die Marienstatue entstanden ist."
+
+[[resources]]
+  title = "Die Neue Madonna im Hof"
+  src = "bilder/madonna-neu-im-hof.jpg"
+  [resources.params]
+    alt = "Die neue Madonna steht fertig im Hof in Niederkassel."
+
+[[resources]]
+  title = "Die Neue Madonna in der Werkstatt"
+  src = "bilder/madonna-neu-werkstatt.jpg"
+  [resources.params]
+    alt = "Die neue Statue in der Werkstatt."
+
+[[resources]]
+  title = "Punktieren"
+  src = "bilder/madonna-punktieren.jpg"
+  [resources.params]
+    alt = "Die neue Madonna wird Punktiert. Dabei wird mit der Punktiermaschine von der alten Form die neue erstellt."
+
+[[resources]]
+  title = "Montage"
+  src = "bilder/madonna-bei-montage.jpg"
+  [resources.params]
+    alt = "Die neue Madonna wird in ihre Nische an der Kirche in Uckendorf geschoben."
 +++
 
 *Material: Londorfer Basalt-Lava*
@@ -22,4 +69,6 @@ Eine Marienstatue an der Pfarrkirche "Zu den Sieben Schmerzen Mariens" Uckendorf
 
 Die Figur ist die Rekonstruktion einer Mariendarstellung mit Jesuskind, die der Kirche im Jahre 1908 geschenkt wurde. Die Ursprüngliche neugotische Statue war aus Muschelkalk und im laufe der 90 Jahre die sie an der Kirche verweilt hatte schwer verwittert und nicht mehr zu restaurieren. Darum wurde 1997 der Beschluss gefasst die Plastik der Namenspatronin der an der Westseite der Kirche zu erneuern. Dafür wurde diesmal als Material die deutlich robustere und witterungsbeständigere Basalt-Lava zum Einsatz, die zu dieser Zeit mit moderneren Werkzeugen einfacher bearbeitet werden konnte wie in den Anfängen des Jahrhunderts. 
 
-Gemeißelt wurde die Vollplastik aus einem Block mit einer Größe von etwa 170x75x50cm und einem Gewicht von etwa 1200kg aus dem Basaltwerk Großen Buseck in der Nähe von Londorf in Hessen. Zusammen mit dem Bildhauer Albert Weißenberger wurde die 158cm hohe und 450kg schwere Figur in unserer Werkstatt in Niederkassel aus dem Rohblock gesägt und gehauen. Während eines Pfarrfestes am 27. September 1998 wurde die Statue von Erzbischof Dr. Joachim Kardinal Meisner im Rahmen einer Andacht zwischen Niederkassel und Uckendorf geweiht. 
+Gemeißelt wurde die Vollplastik aus einem Block mit einer Größe von etwa 170x75x50cm und einem Gewicht von etwa 1200kg aus dem Basaltwerk Großen Buseck in der Nähe von Londorf in Hessen. Zusammen mit dem Bildhauer Albert Weißenberger wurde die 158cm hohe und 450kg schwere Figur in unserer Werkstatt in Niederkassel aus dem Rohblock gesägt und gehauen. Während eines Pfarrfestes am 27. September 1998 wurde die Statue von Erzbischof Dr. Joachim Kardinal Meisner im Rahmen einer Andacht zwischen Niederkassel und Uckendorf geweiht. 
+
+{{< gallery "bilder/**.jpg" >}}

data/kontakt.toml

@@ -2,7 +2,7 @@
 email = "info@neff-steindesign.de"
 faxNumber = "+49 2208 947513"
 name = "Neff Stein-Design"
-telephone = "+49 2208 4575"
+telephone = "+49 2208 4574"
 openingHours = ["Mo-Fr 08:00-12:00", "Mo-Fr 13:30-17:00", "Sa 09:00-12:00"]
 images = ["/img/kontakt/niederkassel.jpg"]
     [kontakt.address]

package-lock.json

@@ -0,0 +1,776 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "ajv": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz",
+      "integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^2.0.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
+      "dev": true
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dev": true,
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "big.js": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
+      "dev": true
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "chownr": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
+      "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
+      "dev": true
+    },
+    "color": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.1.0.tgz",
+      "integrity": "sha512-CwyopLkuRYO5ei2EpzpIh6LqJMt6Mt+jZhO5VI5f/wJLZriXQE32/SSqzmrh+QB+AZT81Cj8yv+7zwToW8ahZg==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.1",
+        "color-string": "^1.5.2"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "color-string": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
+      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
+      "dev": true,
+      "requires": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
+    "combined-stream": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
+      "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "cwise-compiler": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/cwise-compiler/-/cwise-compiler-1.1.3.tgz",
+      "integrity": "sha1-9NZnQQ6FDToxOn0tt7HlBbsDTMU=",
+      "dev": true,
+      "requires": {
+        "uniq": "^1.0.0"
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "data-uri-to-buffer": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz",
+      "integrity": "sha1-GK6XmmoMqZSwYlhTkW0mYruuCxo=",
+      "dev": true
+    },
+    "datauri": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/datauri/-/datauri-1.0.5.tgz",
+      "integrity": "sha1-0JddGrbI8uDOPKQ7qkU5vhLSiaA=",
+      "dev": true,
+      "requires": {
+        "image-size": "^0.3.5",
+        "mimer": "^0.2.1",
+        "semver": "^5.0.3"
+      },
+      "dependencies": {
+        "image-size": {
+          "version": "0.3.5",
+          "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.3.5.tgz",
+          "integrity": "sha1-gyQOqy+1sAsEqrjHSwRx6cunrYw=",
+          "dev": true
+        }
+      }
+    },
+    "decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
+    "detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+      "dev": true
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dev": true,
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true
+    },
+    "fast-deep-equal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dev": true,
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "fs-minipass": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
+      "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
+      "dev": true,
+      "requires": {
+        "minipass": "^2.2.1"
+      }
+    },
+    "get-pixels": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/get-pixels/-/get-pixels-3.3.0.tgz",
+      "integrity": "sha1-jZeVvq4YhQuED3SVgbrcBdPjbkE=",
+      "dev": true,
+      "requires": {
+        "data-uri-to-buffer": "0.0.3",
+        "jpeg-js": "^0.1.1",
+        "mime-types": "^2.0.1",
+        "ndarray": "^1.0.13",
+        "ndarray-pack": "^1.1.1",
+        "node-bitmap": "0.0.1",
+        "omggif": "^1.0.5",
+        "parse-data-uri": "^0.2.0",
+        "pngjs": "^2.0.0",
+        "request": "^2.44.0",
+        "through": "^2.3.4"
+      }
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true
+    },
+    "har-validator": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.5.5",
+        "har-schema": "^2.0.0"
+      }
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "image-size": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.1.tgz",
+      "integrity": "sha1-KO6oVIpLFENIDd3cHgg65UZSQ58=",
+      "dev": true
+    },
+    "iota-array": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/iota-array/-/iota-array-1.0.0.tgz",
+      "integrity": "sha1-ge9X/l0FgUzVjCSDYyqZwwoOgIc=",
+      "dev": true
+    },
+    "is-arrayish": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+      "dev": true
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "jpeg-js": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.1.2.tgz",
+      "integrity": "sha1-E1uZLAV1yYXPoPSUoyJ+0jhYPs4=",
+      "dev": true
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "json5": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+      "dev": true
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "loader-utils": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
+      "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+      "dev": true,
+      "requires": {
+        "big.js": "^3.1.3",
+        "emojis-list": "^2.0.0",
+        "json5": "^0.5.0"
+      }
+    },
+    "mime-db": {
+      "version": "1.37.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
+      "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.21",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz",
+      "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==",
+      "dev": true,
+      "requires": {
+        "mime-db": "~1.37.0"
+      }
+    },
+    "mimer": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/mimer/-/mimer-0.2.3.tgz",
+      "integrity": "sha512-cICHJPMZUdZMqWaOQ+Eh0hHo1R6IUCiBee7WvIGGUJsZyjdMUInxQVmyu8hKj5uCy+Bi+Wlp/EsdUR61yOdWOw==",
+      "dev": true
+    },
+    "mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
+    },
+    "minipass": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
+      "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
+      }
+    },
+    "minizlib": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
+      "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
+      "dev": true,
+      "requires": {
+        "minipass": "^2.2.1"
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "nan": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz",
+      "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==",
+      "dev": true
+    },
+    "ndarray": {
+      "version": "1.0.18",
+      "resolved": "https://registry.npmjs.org/ndarray/-/ndarray-1.0.18.tgz",
+      "integrity": "sha1-tg06cyJOxVXQ+qeXEeUCRI/T95M=",
+      "dev": true,
+      "requires": {
+        "iota-array": "^1.0.0",
+        "is-buffer": "^1.0.2"
+      }
+    },
+    "ndarray-pack": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ndarray-pack/-/ndarray-pack-1.2.1.tgz",
+      "integrity": "sha1-jK6+qqJNXs9w/4YCBjeXfajuWFo=",
+      "dev": true,
+      "requires": {
+        "cwise-compiler": "^1.1.2",
+        "ndarray": "^1.0.13"
+      }
+    },
+    "node-bitmap": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/node-bitmap/-/node-bitmap-0.0.1.tgz",
+      "integrity": "sha1-GA6scAPgxwdhjvMTaPYvhLKmkJE=",
+      "dev": true
+    },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "dev": true
+    },
+    "omggif": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.9.tgz",
+      "integrity": "sha1-3LcCTazVDFK00wPwSALJHAV8dl8=",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "parse-data-uri": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/parse-data-uri/-/parse-data-uri-0.2.0.tgz",
+      "integrity": "sha1-vwTYUd1ch7CrI45dAazklLYEtMk=",
+      "dev": true,
+      "requires": {
+        "data-uri-to-buffer": "0.0.3"
+      }
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
+    },
+    "pngjs": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-2.3.1.tgz",
+      "integrity": "sha1-EdHhK5y2TWPjDBQ6Mw9MH1Z9qF8=",
+      "dev": true
+    },
+    "psl": {
+      "version": "1.1.31",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
+      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
+      "dev": true
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "dev": true
+    },
+    "request": {
+      "version": "2.88.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+      "dev": true,
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.0",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.4.3",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "semver": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+      "dev": true
+    },
+    "sharp": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.19.1.tgz",
+      "integrity": "sha1-gZvxH1w/T/MutGXyVbX7h+Q87qE=",
+      "dev": true,
+      "requires": {
+        "color": "^3.0.0",
+        "detect-libc": "^1.0.3",
+        "nan": "^2.9.2",
+        "semver": "^5.5.0",
+        "simple-get": "^2.7.0",
+        "tar": "^4.4.0",
+        "tunnel-agent": "^0.6.0"
+      }
+    },
+    "simple-concat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz",
+      "integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=",
+      "dev": true
+    },
+    "simple-get": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz",
+      "integrity": "sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==",
+      "dev": true,
+      "requires": {
+        "decompress-response": "^3.3.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
+    "simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.3.1"
+      }
+    },
+    "srcset-loader": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/srcset-loader/-/srcset-loader-2.3.0.tgz",
+      "integrity": "sha512-b8U7Oqdy5Nrypuu0+CgwD8lW2idRNDzV968xWoVW66bqWQyKUiYVgmJRQs/gTZOgNAd+rVZwSu99TmB2HvAsOw==",
+      "dev": true,
+      "requires": {
+        "datauri": "1.0.5",
+        "get-pixels": "3.3.0",
+        "image-size": "0.5.1",
+        "loader-utils": "1.1.0",
+        "sharp": "^0.19.0"
+      }
+    },
+    "sshpk": {
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.0.tgz",
+      "integrity": "sha512-Zhev35/y7hRMcID/upReIvRse+I9SVhyVre/KTJSJQWMz3C3+G+HpO7m1wK/yckEtujKZ7dS4hkVxAnmHaIGVQ==",
+      "dev": true,
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
+    "tar": {
+      "version": "4.4.8",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
+      "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+      "dev": true,
+      "requires": {
+        "chownr": "^1.1.1",
+        "fs-minipass": "^1.2.5",
+        "minipass": "^2.3.4",
+        "minizlib": "^1.1.1",
+        "mkdirp": "^0.5.0",
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.2"
+      }
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "tough-cookie": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+      "dev": true,
+      "requires": {
+        "psl": "^1.1.24",
+        "punycode": "^1.4.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        }
+      }
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true
+    },
+    "uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+      "dev": true
+    },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "uuid": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+      "dev": true
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "yallist": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+      "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+      "dev": true
+    }
+  }
+}

static/.htaccess

@@ -1,6 +1,9 @@
 <IfModule mod_rewrite.c>
 RewriteEngine On
 
+RewriteCond %{HTTP_HOST} !^www\.
+RewriteRule ^(.*)$ https://www.%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
+
 ## Start new rules
 RewriteRule ^app/uploads/.*$ / [R=301,L]
 RewriteRule ^home/aktuelles/.*$ /neuigkeiten/ [R=301,L]

themes/neff/.gitignore

@@ -1 +1,5 @@
-node_modules/*
+node_modules/*
+static/fonts
+static/img
+assets/css
+assets/js

themes/neff/assets/scss/_mixins.scss

@@ -1,65 +0,0 @@
-@mixin trim-list-margin-horizontal {
-    & {
-        li {
-            &:first-child {
-                margin-left: 0;
-            }
-
-            &:last-child {
-                margin-right: 0;
-            }
-        }
-    }
-}
-
-@mixin menu-list($direction) {
-    & {
-        list-style: none;
-        margin: 0;
-        padding: 0;
-        display: flex;
-        flex-direction: #{$direction};
-
-        li {
-            flex: 0 0 auto;
-            margin: 0 $gutter-width;
-        }
-    }
-}
-
-@mixin background($class) {
-    $background-image-sd: "/img/background/" + $class + "-sd.jpg";
-    $background-image: "/img/background/" + $class + ".jpg";
-    $background-image-portrait-sd: "/img/background/" + $class + "-portrait-sd.jpg";
-    $background-image-portrait: "/img/background/" + $class + "-portrait.jpg";
-
-    & {
-        background-position: center;
-        background-attachment: fixed;
-        background-size: cover;
-        background-repeat: no-repeat;
-
-        &.background-#{$class} {
-            background-image: url(#{$background-image-portrait-sd});
-        }
-
-        @media only screen and (min-width: 800px) and (orientation: portrait) {
-            &.background-#{$class} {
-                background-image: url(#{$background-image-portrait});
-            }
-        }
-
-        @media only screen and (min-width: 600px) and (orientation: landscape) {
-            &.background-#{$class} {
-                background-image: url(#{$background-image-sd});
-            }
-        }
-
-        @media only screen and (min-width: 1200px) and (orientation: landscape) {
-            &.background-#{$class} {
-                background-image: url(#{$background-image});
-            }
-        }
-    }
-}
-

themes/neff/assets/scss/fontawesome/_animated.scss

@@ -1,20 +0,0 @@
-// Animated Icons
-// --------------------------
-
-.#{$fa-css-prefix}-spin {
-  animation: fa-spin 2s infinite linear;
-}
-
-.#{$fa-css-prefix}-pulse {
-  animation: fa-spin 1s infinite steps(8);
-}
-
-@keyframes fa-spin {
-  0% {
-    transform: rotate(0deg);
-  }
-
-  100% {
-    transform: rotate(360deg);
-  }
-}

themes/neff/assets/scss/fontawesome/_bordered-pulled.scss

@@ -1,20 +0,0 @@
-// Bordered & Pulled
-// -------------------------
-
-.#{$fa-css-prefix}-border {
-  border: solid .08em $fa-border-color;
-  border-radius: .1em;
-  padding: .2em .25em .15em;
-}
-
-.#{$fa-css-prefix}-pull-left { float: left; }
-.#{$fa-css-prefix}-pull-right { float: right; }
-
-.#{$fa-css-prefix},
-.fas,
-.far,
-.fal,
-.fab {
-  &.#{$fa-css-prefix}-pull-left { margin-right: .3em; }
-  &.#{$fa-css-prefix}-pull-right { margin-left: .3em; }
-}

themes/neff/assets/scss/fontawesome/_core.scss

@@ -1,20 +0,0 @@
-// Base Class Definition
-// -------------------------
-
-.#{$fa-css-prefix},
-.fas,
-.far,
-.fal,
-.fab {
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  text-rendering: auto;
-  line-height: 1;
-}
-
-%fa-icon {
-  @include fa-icon;
-}

themes/neff/assets/scss/fontawesome/_fixed-width.scss

@@ -1,6 +0,0 @@
-// Fixed Width Icons
-// -------------------------
-.#{$fa-css-prefix}-fw {
-  text-align: center;
-  width: $fa-fw-width;
-}

themes/neff/assets/scss/fontawesome/_larger.scss

@@ -1,23 +0,0 @@
-// Icon Sizes
-// -------------------------
-
-// makes the font 33% larger relative to the icon container
-.#{$fa-css-prefix}-lg {
-  font-size: (4em / 3);
-  line-height: (3em / 4);
-  vertical-align: -.0667em;
-}
-
-.#{$fa-css-prefix}-xs {
-  font-size: .75em;
-}
-
-.#{$fa-css-prefix}-sm {
-  font-size: .875em;
-}
-
-@for $i from 1 through 10 {
-  .#{$fa-css-prefix}-#{$i}x {
-    font-size: $i * 1em;
-  }
-}

themes/neff/assets/scss/fontawesome/_list.scss

@@ -1,18 +0,0 @@
-// List Icons
-// -------------------------
-
-.#{$fa-css-prefix}-ul {
-  list-style-type: none;
-  margin-left: $fa-li-width * 5/4;
-  padding-left: 0;
-
-  > li { position: relative; }
-}
-
-.#{$fa-css-prefix}-li {
-  left: -$fa-li-width;
-  position: absolute;
-  text-align: center;
-  width: $fa-li-width;
-  line-height: inherit;
-}

themes/neff/assets/scss/fontawesome/_mixins.scss

@@ -1,57 +0,0 @@
-// Mixins
-// --------------------------
-
-@mixin fa-icon {
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
-  vertical-align: -.125em;
-}
-
-@mixin fa-icon-rotate($degrees, $rotation) {
-  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation})";
-  transform: rotate($degrees);
-}
-
-@mixin fa-icon-flip($horiz, $vert, $rotation) {
-  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}, mirror=1)";
-  transform: scale($horiz, $vert);
-}
-
-
-// Only display content to screen readers. A la Bootstrap 4.
-//
-// See: http://a11yproject.com/posts/how-to-hide-content/
-
-@mixin sr-only {
-  border: 0;
-  clip: rect(0, 0, 0, 0);
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  width: 1px;
-}
-
-// Use in conjunction with .sr-only to only display content when it's focused.
-//
-// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1
-//
-// Credit: HTML5 Boilerplate
-
-@mixin sr-only-focusable {
-  &:active,
-  &:focus {
-    clip: auto;
-    height: auto;
-    margin: 0;
-    overflow: visible;
-    position: static;
-    width: auto;
-  }
-}

themes/neff/assets/scss/fontawesome/_rotated-flipped.scss

@@ -1,23 +0,0 @@
-// Rotated & Flipped Icons
-// -------------------------
-
-.#{$fa-css-prefix}-rotate-90  { @include fa-icon-rotate(90deg, 1);  }
-.#{$fa-css-prefix}-rotate-180 { @include fa-icon-rotate(180deg, 2); }
-.#{$fa-css-prefix}-rotate-270 { @include fa-icon-rotate(270deg, 3); }
-
-.#{$fa-css-prefix}-flip-horizontal { @include fa-icon-flip(-1, 1, 0); }
-.#{$fa-css-prefix}-flip-vertical   { @include fa-icon-flip(1, -1, 2); }
-.#{$fa-css-prefix}-flip-horizontal.#{$fa-css-prefix}-flip-vertical { @include fa-icon-flip(-1, -1, 2); }
-
-// Hook for IE8-9
-// -------------------------
-
-:root {
-  .#{$fa-css-prefix}-rotate-90,
-  .#{$fa-css-prefix}-rotate-180,
-  .#{$fa-css-prefix}-rotate-270,
-  .#{$fa-css-prefix}-flip-horizontal,
-  .#{$fa-css-prefix}-flip-vertical {
-    filter: none;
-  }
-}

themes/neff/assets/scss/fontawesome/_screen-reader.scss

@@ -1,5 +0,0 @@
-// Screen Readers
-// -------------------------
-
-.sr-only { @include sr-only; }
-.sr-only-focusable { @include sr-only-focusable; }

themes/neff/assets/scss/fontawesome/_stacked.scss

@@ -1,31 +0,0 @@
-// Stacked Icons
-// -------------------------
-
-.#{$fa-css-prefix}-stack {
-  display: inline-block;
-  height: 2em;
-  line-height: 2em;
-  position: relative;
-  vertical-align: middle;
-  width: ($fa-fw-width*2);
-}
-
-.#{$fa-css-prefix}-stack-1x,
-.#{$fa-css-prefix}-stack-2x {
-  left: 0;
-  position: absolute;
-  text-align: center;
-  width: 100%;
-}
-
-.#{$fa-css-prefix}-stack-1x {
-  line-height: inherit;
-}
-
-.#{$fa-css-prefix}-stack-2x {
-  font-size: 2em;
-}
-
-.#{$fa-css-prefix}-inverse {
-  color: $fa-inverse;
-}

themes/neff/assets/scss/fontawesome/brands.scss

@@ -1,21 +0,0 @@
-/*!
- * Font Awesome Free 5.6.1 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- */
-@import 'variables';
-
-@font-face {
-  font-family: 'Font Awesome 5 Brands';
-  font-style: normal;
-  font-weight: normal;
-  src: url('#{$fa-font-path}/fa-brands-400.eot');
-  src: url('#{$fa-font-path}/fa-brands-400.eot?#iefix') format('embedded-opentype'),
-  url('#{$fa-font-path}/fa-brands-400.woff2') format('woff2'),
-  url('#{$fa-font-path}/fa-brands-400.woff') format('woff'),
-  url('#{$fa-font-path}/fa-brands-400.ttf') format('truetype'),
-  url('#{$fa-font-path}/fa-brands-400.svg#fontawesome') format('svg');
-}
-
-.fab {
-  font-family: 'Font Awesome 5 Brands';
-}

themes/neff/assets/scss/fontawesome/fontawesome.scss

@@ -1,16 +0,0 @@
-/*!
- * Font Awesome Free 5.6.1 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- */
-@import 'variables';
-@import 'mixins';
-@import 'core';
-@import 'larger';
-@import 'fixed-width';
-@import 'list';
-@import 'bordered-pulled';
-@import 'animated';
-@import 'rotated-flipped';
-@import 'stacked';
-@import 'icons';
-@import 'screen-reader';

themes/neff/assets/scss/fontawesome/regular.scss

@@ -1,22 +0,0 @@
-/*!
- * Font Awesome Free 5.6.1 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- */
-@import 'variables';
-
-@font-face {
-  font-family: 'Font Awesome 5 Free';
-  font-style: normal;
-  font-weight: 400;
-  src: url('#{$fa-font-path}/fa-regular-400.eot');
-  src: url('#{$fa-font-path}/fa-regular-400.eot?#iefix') format('embedded-opentype'),
-  url('#{$fa-font-path}/fa-regular-400.woff2') format('woff2'),
-  url('#{$fa-font-path}/fa-regular-400.woff') format('woff'),
-  url('#{$fa-font-path}/fa-regular-400.ttf') format('truetype'),
-  url('#{$fa-font-path}/fa-regular-400.svg#fontawesome') format('svg');
-}
-
-.far {
-  font-family: 'Font Awesome 5 Free';
-  font-weight: 400;
-}

themes/neff/assets/scss/fontawesome/solid.scss

@@ -1,23 +0,0 @@
-/*!
- * Font Awesome Free 5.6.1 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- */
-@import 'variables';
-
-@font-face {
-  font-family: 'Font Awesome 5 Free';
-  font-style: normal;
-  font-weight: 900;
-  src: url('#{$fa-font-path}/fa-solid-900.eot');
-  src: url('#{$fa-font-path}/fa-solid-900.eot?#iefix') format('embedded-opentype'),
-  url('#{$fa-font-path}/fa-solid-900.woff2') format('woff2'),
-  url('#{$fa-font-path}/fa-solid-900.woff') format('woff'),
-  url('#{$fa-font-path}/fa-solid-900.ttf') format('truetype'),
-  url('#{$fa-font-path}/fa-solid-900.svg#fontawesome') format('svg');
-}
-
-.fa,
-.fas {
-  font-family: 'Font Awesome 5 Free';
-  font-weight: 900;
-}

themes/neff/assets/scss/fontawesome/v4-shims.scss

@@ -1,6 +0,0 @@
-/*!
- * Font Awesome Free 5.6.1 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- */
-@import 'variables';
-@import 'shims';

themes/neff/assets/scss/main.scss

@@ -1,13 +0,0 @@
-@import "reset";
-@import "fonts";
-@import "variables";
-@import "mixins";
-@import "grid";
-@import "header";
-@import "footer";
-@import "list";
-@import "single";
-@import "index";
-@import "lightbox";
-@import "content";
-@import "banner";

themes/neff/layouts/partials/footer.html

@@ -2,7 +2,7 @@
     <div class="container">
         <section id="index-contact">
             <div>
-                <a class="anchor" id="{{ i18n "contact" }}"><h1 class="padding">Kontakt</h1></a>
+                <h2 class="padding"><a class="anchor" id="{{ i18n "contact" }}">Kontakt</a></h2>
                 <div class="call-to-action flex row text-center">
                     <div class="padding">
                         <a class="btn btn-primary" href="mailto:{{ .Site.Author.email }}">{{ i18n "send-mail" }}</a>

themes/neff/layouts/partials/head.html

@@ -8,14 +8,9 @@
 {{- if (eq .Kind "section") -}}
 {{- partial "schema/collectionpage.html" . -}}
 {{- end -}}
-{{- $options := (dict "targetPath" "css/style.css" "outputStyle" "compressed") -}}
+{{- $css := resources.Get "css/style.css" -}}
-{{- if .Site.IsServer -}}
+{{- $css = $css | resources.Fingerprint -}}
-{{- $options := (dict "targetPath" "css/style.css" "enableSourceMap" true) -}}
+<link rel="stylesheet" href="{{ $css.Permalink }}"  integrity="{{ $css.Data.Integrity }}">
-{{- end -}}
-{{- $sass := resources.Get "scss/main.scss" | resources.ExecuteAsTemplate "scss/bundle.scss" . | resources.ToCSS $options | resources.PostCSS -}}
-{{- $sass = $sass | resources.Fingerprint -}}
-<link rel="stylesheet" href="{{ $sass.Permalink }}"  integrity="{{ $sass.Data.Integrity }}">
-<link rel="stylesheet" href="/css/cookieconsent.min.css">
 <link rel="shortcut icon" href="/img/favicon.ico">
 <link rel="icon" type="image/svg+xml" href="/img/favicon.svg">
 <link rel="icon" type="image/png" href="/img/favicon.png" sizes="32x32">

themes/neff/layouts/partials/menu-item.html

@@ -1,4 +1,5 @@
 {{- $currentPage := .ctx -}}
+{{- $link := .item -}}
 {{- if (eq .item.Identifier "copyright") -}}
     <li>
         <a href="{{ .item.URL }}">
@@ -7,9 +8,11 @@
     </li>
 {{- else -}}
     <li class="{{ if $currentPage.HasMenuCurrent .item.Menu .item }}active{{ end }}">
+        {{- if ne .item.Title "" -}}
         <a href="{{ .item.URL }}">
-            {{ .item.Pre }}
+            {{ $link.Pre }}
-            <span>{{ .item.Name }}</span>
+            <span>{{ $link.Name }}</span>
         </a>
+        {{- end -}}
     </li>
 {{- end -}}

themes/neff/layouts/partials/menu.html

@@ -3,10 +3,14 @@
 <ul>
     {{- if .HasChildren -}}
         <li class="{{ if $currentPage.HasMenuCurrent .Menu . }}active{{ end }}">
-            <a href="{{ .URL }}">
+            {{- $pre := .Pre -}}
-                {{ .Pre }}
+            {{- $name := .Name -}}
-                <span>{{ .Name }}</span>
+            {{- with .URL  }}
+            <a href="{{ . }}">
+                {{ $pre }}
+                <span>{{ $name }}</span>
             </a>
+            {{- end -}}
             <ul class="sub-menu">
                 {{- range .Children -}}
                     {{ partial "menu-item.html" (dict "item" . "ctx" $currentPage)}}

themes/neff/layouts/partials/schema/site.jsonld

@@ -22,6 +22,6 @@
     "description": "{{ . }}",
     {{ end }}
     "datePublished": {{ .site.PublishDate.Format "2006-01-02T15:04-07:00" | jsonify }},
-    "dateModified": {{ .site.Lastmod.Format "2006-01-02T15:04-07:00" | jsonify }},
+    "dateModified": {{ .site.Lastmod.Format "2006-01-02T15:04-07:00" | jsonify }}
     {{ end }}
 }

themes/neff/layouts/partials/social.html

@@ -1,5 +1,7 @@
 <ul class="social-icons">
     {{- range $key, $value := (index .Site.Data.kontakt.kontakt 0).social -}}
-            <li><a href="{{ $value }}" title="{{ $key | title }}"><i class="fab fa-{{ $key }}"></i></a></li>
+        {{- with $value }}
+            <li><a href="{{ . }}" title="{{ $key | title }}"><i class="fab fa-{{ $key }}"></i></a></li>
+        {{- end -}}
     {{- end -}}
 </ul>

themes/neff/package.json

@@ -10,14 +10,31 @@
   "private": true,
   "license": "MIT",
   "dependencies": {
+    "@babel/polyfill": "^7.2.5",
+    "@fortawesome/fontawesome-free": "^5.6.3"
+  },
+  "devDependencies": {
     "@babel/cli": "^7.2.3",
     "@babel/core": "^7.2.2",
-    "@babel/polyfill": "^7.2.5",
     "@babel/preset-env": "^7.2.3",
     "autoprefixer": "^9.4.3",
     "babel-loader": "^8.0.4",
+    "clean-webpack-plugin": "^1.0.0",
     "cookieconsent": "^3.1.0",
-    "precss": "^4.0.0",
+    "css-loader": "^2.1.0",
+    "css-validator-loader": "^1.1.3",
+    "file-loader": "^3.0.1",
+    "font-loader": "^0.1.2",
+    "image-webpack-loader": "^4.6.0",
+    "mini-css-extract-plugin": "^0.5.0",
+    "node-sass": "^4.11.0",
+    "optimize-css-assets-webpack-plugin": "^5.0.1",
+    "postcss-loader": "^3.0.0",
+    "postcss-preset-env": "^6.5.0",
+    "sass-loader": "^7.1.0",
+    "style-loader": "^0.23.1",
+    "uglifyjs-webpack-plugin": "^2.1.1",
+    "url-loader": "^1.1.2",
     "webpack": "^4.28.2",
     "webpack-cli": "^3.1.2"
   }

themes/neff/postcss.config.js

@@ -1,6 +1,5 @@
 module.exports = {
   plugins: [
-    require('precss'),
     require('autoprefixer')
   ]
 }

themes/neff/src/img/favicon.svg

@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="320"
+   height="320"
+   viewBox="0 0 84.666661 84.666672"
+   version="1.1"
+   id="svg897"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="favicon.svg"
+   inkscape:export-filename="/home/odie/code/web/neff-steindesign.de/images/vector/Favicon/favicon.png"
+   inkscape:export-xdpi="10.24"
+   inkscape:export-ydpi="10.24">
+  <defs
+     id="defs891">
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter1461">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood1451" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite1453" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="3"
+         result="blur"
+         id="feGaussianBlur1455" />
+      <feOffset
+         dx="6"
+         dy="6"
+         result="offset"
+         id="feOffset1457" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="fbSourceGraphic"
+         id="feComposite1459" />
+      <feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix1463" />
+      <feFlood
+         id="feFlood1465"
+         flood-opacity="0.282353"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         in="fbSourceGraphic" />
+      <feComposite
+         in2="fbSourceGraphic"
+         id="feComposite1467"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur1469"
+         in="composite1"
+         stdDeviation="8"
+         result="blur" />
+      <feOffset
+         id="feOffset1471"
+         dx="6"
+         dy="6"
+         result="offset" />
+      <feComposite
+         in2="offset"
+         id="feComposite1473"
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.5"
+     inkscape:cx="98.073463"
+     inkscape:cy="40.613826"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="721"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="1"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       position="-143.40416,65.087502"
+       orientation="0,1"
+       id="guide21"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata894">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-212.3333)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.99742605;stroke:none;stroke-width:0.79763037;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect1494"
+       width="84.666664"
+       height="84.666664"
+       x="0.39509311"
+       y="211.9382"
+       rx="13.229167"
+       ry="13.229167" />
+    <path
+       style="display:inline;fill:#2d763a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.3518796;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1461)"
+       d="m 253.29883,18.007812 c -22.92571,6.327156 -42.91675,14.709464 -84.78711,7.775391 4.61352,15.773556 10.6558,33.776374 9.3457,52.511719 C 165.17144,66.210563 151.89605,52.581337 144.07617,42.443359 126.96969,39.065822 110.70703,34.95733 95.574219,24.671875 74.087246,32.837922 45.664486,34.558316 17.453125,36.890625 29.051066,126.00618 23.06419,188.79381 15.230469,250.89258 l 22.955078,31.09961 c 26.988257,-13.43377 68.798403,-25.15061 92.191403,-25.17578 -3.60646,-17.68128 -10.18158,-47.50292 -8.88672,-68.125 43.92598,42.59308 50.39522,61.09098 68.4961,87.37695 C 214.43764,269.25818 244.36992,260.25563 284.0293,262 278.10315,193.19786 271.72336,120.23443 284.76953,42.074219 270.16147,34.052247 262.24176,26.029822 253.29883,18.007812 Z m -2.70508,14.542969 c -7.22105,53.320857 -5.50703,135.125169 -2.51758,192.660159 -24.38207,1.05464 -50.71277,7.54216 -68.16992,14.13672 -23.45938,-30.44376 -55.84891,-66.55187 -85.871094,-91.14454 -0.0511,23.62458 -0.597462,46.24217 3.294922,83.01172 -21.72853,1.21376 -48.603502,12.17407 -70.046875,19.62696 5.576546,-64.57811 11.268986,-137.57037 3.025391,-202.148441 25.198495,-1.402356 48.541918,-4.28785 61.146484,-9.208984 27.985892,32.710828 63.597892,73.073175 96.560542,98.628905 0.42309,-46.845089 -2.16153,-85.031895 -7.03515,-99.650389 25.17105,4.881222 52.96197,-0.330919 69.61328,-5.91211 z"
+       transform="matrix(0.23573727,0,0,0.23723225,6.275318,218.38393)"
+       id="path5411"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

themes/neff/src/img/hero/4w.svg

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg896"
+   version="1.1"
+   viewBox="0 0 52.916665 52.916668"
+   height="200"
+   width="200">
+  <defs
+     id="defs890" />
+  <metadata
+     id="metadata893">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-244.08332)"
+     id="layer1">
+    <path
+       id="path5469"
+       d="m 28.179157,249.82276 c -4.420459,5.47409 -9.277968,10.71866 -14.800645,15.09055 0.894629,0.72064 1.076716,1.33575 1.430403,1.9482 2.731994,-0.11156 5.67589,-0.22416 8.596375,-0.32608 -0.0303,3.93657 -0.131824,7.87356 -0.408761,11.81013 -0.654239,0.89429 -1.447923,1.68127 -2.487703,2.56987 -0.75986,-0.80699 -0.934957,-1.4966 -1.160653,-2.19676 -2.163561,0.4878 -4.297944,0.66823 -6.674528,2.19676 1.694748,2.22521 3.114137,4.65755 4.146001,7.37992 0.75394,0.57647 1.428146,1.19277 1.90686,1.90686 1.245662,-0.35175 2.31315,-0.65543 3.586344,-0.70435 1.929627,-2.58386 3.181996,-3.63098 4.311365,-4.56097 1.049615,0.96607 2.202023,2.2378 2.881479,3.35846 0.488719,0.37392 0.901057,0.70016 1.285192,1.49241 1.514697,-0.39353 2.791309,-0.74655 3.979601,-0.70487 1.345631,-2.77766 3.385603,-5.61747 5.472535,-8.10493 -1.715958,-0.97873 -3.438961,-2.34252 -6.434748,-2.99258 -0.213321,0.78078 -0.588473,1.6444 -1.305349,2.42518 -0.778372,-0.5187 -1.27491,-1.20648 -1.784903,-1.88619 -0.145523,-3.88259 -0.403831,-8.27059 -0.418062,-12.2282 2.122479,-0.0531 3.633739,-0.0484 5.382617,-0.0563 1.216086,-2.6258 2.432264,-5.04507 3.648355,-6.4673 -3.165533,0.34541 -5.833393,0.50757 -8.998934,0.67541 0.04746,-3.13993 0.140512,-6.30592 0.293005,-9.50588 z m -0.0956,2.06861 c -0.145047,3.22857 -0.167066,6.4726 -0.133326,9.71206 2.641359,-0.10112 5.23082,-0.21686 7.755083,-0.44855 l -2.081527,3.31246 c -1.828247,-0.008 -3.711787,0.0278 -5.627047,0.0827 0.09616,4.96627 0.195659,10.19838 0.445968,14.95826 1.062903,1.23025 2.024261,2.26702 3.308323,3.38636 0.881605,-1.05753 1.706079,-2.14935 2.313554,-3.37137 1.156354,0.17376 2.493574,0.95128 3.399277,1.55701 -1.731807,2.02273 -2.838635,3.98361 -4.217829,6.00635 l -2.960545,0.49816 c -1.16369,-1.49534 -3.312726,-3.72192 -4.754747,-5.06118 -1.948852,1.66453 -3.732669,3.34259 -5.362464,5.21983 l -2.426725,0.35553 c -1.109613,-2.33287 -2.180791,-4.80782 -3.800802,-6.73395 1.056091,-0.88633 2.622465,-1.15811 3.765145,-1.33119 0.461399,1.08847 1.026032,2.12571 1.817977,3.04891 1.518815,-1.25319 3.218106,-2.77324 4.514453,-4.36821 0.156095,-4.68114 0.313934,-9.36243 0.371554,-14.04358 -3.00465,0.11549 -6.068721,0.25536 -9.137427,0.35346 4.499122,-4.04578 9.188451,-8.96273 12.811105,-13.13304 z m -3.664376,6.56652 c -1.113911,1.18038 -1.761445,2.02216 -3.254065,3.42976 1.098007,-0.0593 2.185991,-0.10614 3.266467,-0.14934 0.0023,-1.09343 3.87e-4,-2.18699 -0.0124,-3.28042 z"
+       style="display:inline;opacity:1;fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:0.08445571px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <circle
+       r="23.916712"
+       cy="270.54166"
+       cx="26.458334"
+       id="path1466"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.99999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  </g>
+</svg>

themes/neff/src/img/hero/knuepfel.svg

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg1819"
+   version="1.1"
+   viewBox="0 0 52.916665 52.916668"
+   height="200"
+   width="200"
+   sodipodi:docname="knuepfel.svg"
+   inkscape:version="0.92.2 2405546, 2018-03-11">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="721"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="2.36"
+     inkscape:cx="84.322034"
+     inkscape:cy="98.121025"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1819" />
+  <defs
+     id="defs1813" />
+  <metadata
+     id="metadata1816">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.52192783;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 65.123047 110.95117 L 52.9375 125.51367 C 52.9375 125.51367 56.94691 128.77952 59.326172 129.67383 C 60.637649 130.1666 62.090737 130.17013 63.488281 130.26953 C 65.217657 130.39237 67.182971 129.41139 68.689453 130.26953 C 73.979343 133.28271 81.58929 137.80619 89.490234 142.54102 C 90.480772 142.00384 91.547675 141.42215 92.572266 140.86523 C 92.471269 138.27974 92.368575 136.24016 92.267578 134.41211 C 85.490866 130.18256 78.973226 125.93594 73.890625 122.24414 C 72.30969 121.09581 71.935157 118.85977 70.917969 117.19141 C 70.338488 116.24101 69.863965 115.21024 69.134766 114.36914 C 67.983858 113.04169 65.123047 110.95117 65.123047 110.95117 z M 105.55859 142.51562 C 104.72258 142.99751 103.90845 143.47243 103.08008 143.95117 C 102.92667 146.11675 102.76966 148.25666 102.62109 150.46094 C 114.6472 157.73649 125.16016 164.15039 125.16016 164.15039 C 129.51661 182.15765 146.45518 151.76132 130.0625 156.7207 C 130.0625 156.7207 118.77102 150.39961 105.55859 142.51562 z "
+     transform="scale(0.26458333)"
+     id="path5800" />
+  <path
+     style="display:inline;opacity:1;fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.141;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+     d="M 101.19141 29.197266 C 100.09889 29.178368 99.009611 29.284318 97.964844 29.515625 C 95.06138 30.158485 92.17614 31.718697 90.236328 33.972656 C 88.46622 36.029475 87.235279 38.839298 87.265625 41.552734 C 87.298507 44.505604 87.493428 48.329946 89.421875 50.566406 C 91.075192 52.483723 91.548173 54.145739 93.445312 56.335938 C 90.827109 59.8645 86.947564 65.107908 82.669922 70.910156 L 85.068359 70.931641 L 93.802734 59.533203 L 95.4375 61.761719 L 87.6875 70.955078 L 91.683594 70.990234 C 94.335731 67.913359 96.838211 65.016899 100.36328 60.886719 C 103.45924 64.454176 106.34456 67.759629 109.29492 71.144531 L 112.56836 71.173828 L 95.720703 51.935547 C 95.720703 51.935547 93.43755 49.60401 92.599609 48.220703 C 91.655941 46.66282 90.695204 44.980895 90.519531 43.167969 C 90.348991 41.408145 90.301886 39.278753 91.035156 37.669922 C 91.60633 36.416706 91.657374 36.003228 92.615234 35.013672 C 93.643039 33.951889 94.693145 32.812433 96.033203 32.189453 C 97.539832 31.489069 99.276197 31.274198 100.9375 31.296875 C 102.86092 31.323483 104.90244 31.55218 106.58398 32.486328 C 108.02341 33.285963 109.47428 34.376143 110.37305 35.755859 C 111.3672 37.281995 112.19221 39.005986 112.45312 40.808594 C 112.66003 42.23786 112.14772 44.06525 111.63672 45.416016 C 111.03362 47.01022 108.66406 49.576172 108.66406 49.576172 L 106.13867 47.941406 C 106.13867 47.941406 108.46448 45.392992 108.8125 43.78125 C 109.17182 42.117313 109.327 39.889881 108.58984 38.355469 C 107.7399 36.58631 105.86594 35.17875 104.05664 34.417969 C 102.22956 33.649629 99.943026 33.804491 98.113281 34.566406 C 96.593174 35.199364 95.393244 36.571928 94.546875 37.984375 C 93.88587 39.087506 93.474489 40.413575 93.505859 41.699219 C 93.54785 43.421776 95.140625 46.603516 95.140625 46.603516 L 114.64844 71.191406 L 118.51172 71.224609 C 113.63065 64.650071 109.19167 58.765362 106.24023 55.013672 C 108.17389 52.789798 109.91779 51.954899 111.54297 50.076172 C 112.68828 48.752166 114.16665 45.041674 114.50586 43.324219 C 115.10163 40.307664 114.38767 37.49096 113.00977 34.742188 C 111.85866 32.445898 109.54704 30.705764 107.16992 29.732422 C 105.53721 29.063861 102.99271 29.227199 101.19141 29.197266 z M 101.11719 36.160156 C 102.00122 36.148818 102.90603 36.353031 103.68555 36.720703 C 104.63598 37.168842 105.49599 37.987959 105.91602 38.951172 C 106.45099 40.177969 106.45221 41.6825 106.0625 42.962891 C 105.56902 44.584119 104.08145 46.455981 103.07617 47.820312 C 102.39007 48.751475 101.35937 50.130053 100.62109 51.128906 C 100.31193 50.747816 99.975351 50.321251 99.673828 49.953125 C 98.462936 48.474763 96.616187 46.924244 95.810547 45.191406 C 95.41037 44.330581 95.35207 43.3144 95.439453 42.369141 C 95.549778 41.175868 95.869154 39.935436 96.552734 38.951172 C 97.347059 37.807411 98.487132 36.745213 99.822266 36.349609 C 100.23649 36.226775 100.67404 36.166203 101.11719 36.160156 z M 123.97656 78.626953 C 123.93837 80.023017 123.87294 81.381563 123.78906 82.710938 L 134.52148 96.238281 L 123.71484 83.900391 C 123.62848 85.065503 123.52475 86.203761 123.4043 87.316406 C 132.4951 97.722648 139.49067 105.74859 141.59961 108.4082 C 141.05499 107.63208 156.34004 124.62957 147.58789 111.66016 C 142.64309 104.33266 133.0627 90.996978 123.97656 78.626953 z M 73.066406 83.992188 C 64.648921 95.528402 56.249212 107.23309 51.917969 113.86328 C 43.662589 126.50047 60.855323 106.50239 64.40625 102.35742 C 68.089744 98.057678 71.002496 94.717386 73.835938 91.484375 C 73.662329 90.327092 73.505973 89.144312 73.378906 87.927734 L 58.732422 105.30273 L 73.238281 86.373047 C 73.171069 85.591578 73.113961 84.796967 73.066406 83.992188 z "
+     transform="scale(0.26458333)"
+     id="path5789" />
+  <path
+     style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.52192783;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 134.32031 113.62305 C 134.32031 113.62305 130.79015 116.05151 129.79883 116.83398 C 128.74829 117.66317 127.77315 118.98272 126.85352 119.95508 C 125.38359 121.5093 123.75787 123.80691 121.88672 124.84375 C 116.77982 127.6736 110.38249 131.17301 103.77734 134.77344 C 103.52851 137.69856 103.30236 140.80771 103.08008 143.94531 C 110.95998 139.38528 118.90194 134.86155 124.94531 131.60938 C 126.2103 130.92864 130.02691 131.12386 131.46289 131.08398 C 133.24822 131.03447 135.07047 131.18094 136.8125 130.78711 C 138.8492 130.3265 143.55273 127.7793 143.55273 127.7793 L 134.32031 113.62305 z M 92.572266 140.86523 C 79.396877 148.01666 67.945313 154.19531 67.945312 154.19531 C 49.81758 149.12655 71.354864 178.84597 72.167969 162.14258 C 72.167969 162.14258 81.442552 156.58625 92.861328 149.89258 C 92.764245 146.41978 92.669349 143.35056 92.572266 140.86523 z "
+     transform="scale(0.26458333)"
+     id="path5802" />
+  <circle
+     style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="path1466"
+     cx="26.458334"
+     cy="26.458336"
+     r="23.916712" />
+  <path
+     style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.52192783;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 91.40625 122.26758 C 91.958083 129.97459 92.508718 133.14788 93.060547 157.61328 C 80.986774 175.39781 117.03311 172.66904 102.125 157.76172 C 102.99689 145.10042 103.78476 131.75831 105.09375 122.59375 C 100.6215 124.54783 95.859635 124.41081 91.40625 122.26758 z "
+     transform="scale(0.26458333)"
+     id="path5798" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path5796"
+     d="m 19.353565,18.73958 c -1.202171,17.87131 14.011217,19.56618 13.446989,0.11797 z"
+     style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.66726005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>

themes/neff/src/img/hero/none.svg

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="250"
+   height="250"
+   viewBox="0 0 66.145832 66.145835"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="none.svg"
+   inkscape:version="0.92.2 2405546, 2018-03-11">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="-89.319568"
+     inkscape:cy="27.142326"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="1003"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-230.85415)">
+    <circle
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#2371d1;stroke-width:0.79375;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path815"
+       cx="33.072918"
+       cy="263.92706"
+       r="31.755989" />
+  </g>
+</svg>

themes/neff/src/js/images.js

@@ -0,0 +1,2 @@
+function requireAll(r) { r.keys().forEach(r); }
+requireAll(require.context('../img/', true, /\.(png|gif|jpg|jpeg|svg)$/));

themes/neff/src/scss/_fonts.scss

@@ -1,51 +1,3 @@
-@import 'variables';
-@import 'fontawesome/variables';
-@import 'fontawesome/mixins';
-@import 'fontawesome/core';
-@import 'fontawesome/larger';
-@import 'fontawesome/fixed-width';
-@import 'fontawesome/list';
-@import 'fontawesome/bordered-pulled';
-@import 'fontawesome/animated';
-@import 'fontawesome/rotated-flipped';
-@import 'fontawesome/stacked';
-@import 'fontawesome/icons';
-@import 'fontawesome/screen-reader';
-
-@font-face {
-  font-family: 'Font Awesome 5 Free';
-  font-style: normal;
-  font-weight: 900;
-  src: url('#{$fa-font-path}/fa-solid-900.eot');
-  src: url('#{$fa-font-path}/fa-solid-900.eot?#iefix') format('embedded-opentype'),
-  url('#{$fa-font-path}/fa-solid-900.woff2') format('woff2'),
-  url('#{$fa-font-path}/fa-solid-900.woff') format('woff'),
-  url('#{$fa-font-path}/fa-solid-900.ttf') format('truetype'),
-  url('#{$fa-font-path}/fa-solid-900.svg#fontawesome') format('svg');
-}
-
-@font-face {
-  font-family: 'Font Awesome 5 Brands';
-  font-style: normal;
-  font-weight: normal;
-  src: url('#{$fa-font-path}/fa-brands-400.eot');
-  src: url('#{$fa-font-path}/fa-brands-400.eot?#iefix') format('embedded-opentype'),
-  url('#{$fa-font-path}/fa-brands-400.woff2') format('woff2'),
-  url('#{$fa-font-path}/fa-brands-400.woff') format('woff'),
-  url('#{$fa-font-path}/fa-brands-400.ttf') format('truetype'),
-  url('#{$fa-font-path}/fa-brands-400.svg#fontawesome') format('svg');
-}
-
-.fa,
-.fas {
-  font-family: 'Font Awesome 5 Free';
-  font-weight: 900;
-}
-
-.fab {
-  font-family: 'Font Awesome 5 Brands';
-}
-
 /* roboto-regular - latin */
 @font-face {
     font-family: 'Roboto';

themes/neff/src/scss/_index.scss

@@ -22,13 +22,13 @@
 
     #index-short-contact {
         font-size: 1.1rem;
-        align-items: top;
+        align-items: flex-start;
         background-color: rgba(255, 255, 255, 0.9);
         height: 90px;
         border-radius: $border-radius;
         padding: $gutter-width;
         margin: calc(100vh - 310px) -$gutter-width 0 -$gutter-width;
-        overflow: none;
+        overflow: hidden;
         min-width: 100%;
 
         @media only screen and (min-width: $media-query) {