12 files changed, 51 insertions, 9 deletions
diff --git a/gospeladlershof.de/gulpfile.js b/gospeladlershof.de/gulpfile.js
index a393332..398268e 100644
--- a/gospeladlershof.de/gulpfile.js
+++ b/gospeladlershof.de/gulpfile.js
@@ -46,9 +46,13 @@ gulp.task('uncss', function() {
 		.pipe(cssnano())
 		.pipe(gulp.dest('./static/uncss'));
 });
+/**
+ * {discardUnused: false} ist nötig, um font-face nicht aus der CSS zu löschen. Sieht für mich nach nem Bug aus.
+ * https://github.com/ben-eb/gulp-cssnano/issues/49
+ */
 gulp.task('concat2', function() {
-	return gulp.src(['static/uncss/concat.css', 'static/css/magnific-popup.css', 'static/css/theme.css', 'static/css/chor.css'])
-	.pipe(cssnano())
+	return gulp.src(['static/css/opensans.css', 'static/css/merriweather.css', 'static/uncss/concat.css', 'static/css/magnific-popup.css', 'static/css/theme.css', 'static/css/chor.css'])
+	.pipe(cssnano({discardUnused: false}))
 	.pipe(concat('concat.css'))
 	.pipe(gulp.dest('./static/uncss/'));
 });
diff --git a/gospeladlershof.de/layouts/partials/header.tmpl b/gospeladlershof.de/layouts/partials/header.tmpl
index 0396c67..4950b8a 100644
--- a/gospeladlershof.de/layouts/partials/header.tmpl
+++ b/gospeladlershof.de/layouts/partials/header.tmpl
@@ -26,8 +26,10 @@
     <link rel="stylesheet" href="{{.Site.BaseURL}}css/bootstrap.min.css" type="text/css">
 
     <!-- Custom Fonts -->
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' rel='stylesheet' type='text/css'>
-    <link href='https://fonts.googleapis.com/css?family=Merriweather:400,300,300italic,400italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+    <!--link href='https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' rel='stylesheet' type='text/css'>
+    <link href='https://fonts.googleapis.com/css?family=Merriweather:400,300,300italic,400italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'-->
+    <link rel="stylesheet" href="{{.Site.BaseURL}}css/opensans.css" type="text/css">
+    <link rel="stylesheet" href="{{.Site.BaseURL}}css/merriweather.css" type="text/css">
     <link rel="stylesheet" href="{{.Site.BaseURL}}font-awesome/css/font-awesome.min.css" type="text/css">
 
     <!-- Plugin CSS -->
@@ -39,17 +41,13 @@
     <link rel="stylesheet" href="{{.Site.BaseURL}}css/chor.css" type="text/css">
 {{ else }}
 
-    <!-- Custom Fonts -->
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' rel='stylesheet' type='text/css'>
-    <link href='https://fonts.googleapis.com/css?family=Merriweather:400,300,300italic,400italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
-
 	{{$read := getenv "HUGO_READ_CONCAT"}}
 	{{if eq $read "1"}}
 		<style>
 		{{readFile "static/uncss/concat.css" | safeCSS}}
 		</style>
         {{else}}
-    <link rel="stylesheet" href="{{.Site.BaseURL}}css/concat.css" type="text/css">
+    		<link rel="stylesheet" href="{{.Site.BaseURL}}css/concat.css" type="text/css">
 	{{end}}
 
 <!-- Piwik -->
diff --git a/gospeladlershof.de/static/css/merriweather.css b/gospeladlershof.de/static/css/merriweather.css
new file mode 100644
index 0000000..7be1411
--- /dev/null
+++ b/gospeladlershof.de/static/css/merriweather.css
@@ -0,0 +1,20 @@
+/* merriweather-regular - latin */
+@font-face {
+  font-family: 'Merriweather';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Merriweather'), local('Merriweather-Regular'),
+       url('/fonts/merriweather-v15-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('/fonts/merriweather-v15-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* merriweather-700 - latin */
+@font-face {
+  font-family: 'Merriweather';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Merriweather Bold'), local('Merriweather-Bold'),
+       url('/fonts/merriweather-v15-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('/fonts/merriweather-v15-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
diff --git a/gospeladlershof.de/static/css/opensans.css b/gospeladlershof.de/static/css/opensans.css
new file mode 100644
index 0000000..dad15b6
--- /dev/null
+++ b/gospeladlershof.de/static/css/opensans.css
@@ -0,0 +1,20 @@
+/* open-sans-regular - latin */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Open Sans'), local('OpenSans'),
+       url('/fonts/open-sans-v13-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('/fonts/open-sans-v13-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* open-sans-700 - latin */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Open Sans Bold'), local('OpenSans-Bold'),
+       url('/fonts/open-sans-v13-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('/fonts/open-sans-v13-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
diff --git a/gospeladlershof.de/static/fonts/merriweather-v15-latin-700.woff b/gospeladlershof.de/static/fonts/merriweather-v15-latin-700.woff
new file mode 100644
index 0000000..ff64550
--- /dev/null
+++ b/gospeladlershof.de/static/fonts/merriweather-v15-latin-700.woff
diff --git a/gospeladlershof.de/static/fonts/merriweather-v15-latin-700.woff2 b/gospeladlershof.de/static/fonts/merriweather-v15-latin-700.woff2
new file mode 100644
index 0000000..549adc3
--- /dev/null
+++ b/gospeladlershof.de/static/fonts/merriweather-v15-latin-700.woff2
diff --git a/gospeladlershof.de/static/fonts/merriweather-v15-latin-regular.woff b/gospeladlershof.de/static/fonts/merriweather-v15-latin-regular.woff
new file mode 100644
index 0000000..0dd2fa4
--- /dev/null
+++ b/gospeladlershof.de/static/fonts/merriweather-v15-latin-regular.woff
diff --git a/gospeladlershof.de/static/fonts/merriweather-v15-latin-regular.woff2 b/gospeladlershof.de/static/fonts/merriweather-v15-latin-regular.woff2
new file mode 100644
index 0000000..f28203c
--- /dev/null
+++ b/gospeladlershof.de/static/fonts/merriweather-v15-latin-regular.woff2
diff --git a/gospeladlershof.de/static/fonts/open-sans-v13-latin-700.woff b/gospeladlershof.de/static/fonts/open-sans-v13-latin-700.woff
new file mode 100644
index 0000000..18e610d
--- /dev/null
+++ b/gospeladlershof.de/static/fonts/open-sans-v13-latin-700.woff
diff --git a/gospeladlershof.de/static/fonts/open-sans-v13-latin-700.woff2 b/gospeladlershof.de/static/fonts/open-sans-v13-latin-700.woff2
new file mode 100644
index 0000000..be4c25b
--- /dev/null
+++ b/gospeladlershof.de/static/fonts/open-sans-v13-latin-700.woff2
diff --git a/gospeladlershof.de/static/fonts/open-sans-v13-latin-regular.woff b/gospeladlershof.de/static/fonts/open-sans-v13-latin-regular.woff
new file mode 100644
index 0000000..e096d04
--- /dev/null
+++ b/gospeladlershof.de/static/fonts/open-sans-v13-latin-regular.woff
diff --git a/gospeladlershof.de/static/fonts/open-sans-v13-latin-regular.woff2 b/gospeladlershof.de/static/fonts/open-sans-v13-latin-regular.woff2
new file mode 100644
index 0000000..5287058
--- /dev/null
+++ b/gospeladlershof.de/static/fonts/open-sans-v13-latin-regular.woff2