Merge remote-tracking branch 'dadosch/master'

* dadosch/master:
  add config option for CDN use

10 files changed, 44 insertions, 0 deletions

diff --git a/layouts/partials/top.html b/layouts/partials/top.html
index 33e5ff9..1ef2e86 100644
--- a/layouts/partials/top.html
+++ b/layouts/partials/top.html
@@ -22,7 +22,12 @@
   <meta name="description" content="{{ .Description }}">
   {{- end }}
 
+  {{- if .Site.Params.useCDN | default false }}
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro|Arvo:400,700">
+  {{- else }}
+  <link rel="stylesheet" href="{{ "css/fonts.css" | relURL }}">
+  {{- end }}
+
   <link rel="stylesheet" href="{{ "css/highlight.css" | relURL }}">
   <link rel="stylesheet" href="{{ "css/journal.css" | relURL }}">
   <link href="{{ "index.xml" | relURL }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}">
diff --git a/static/css/fonts.css b/static/css/fonts.css
new file mode 100644
index 0000000..5ec1cd4
--- /dev/null
+++ b/static/css/fonts.css
@@ -0,0 +1,39 @@
+/* arvo-regular - latin */
+@font-face {
+  font-family: 'Arvo';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Arvo'),
+       url('../fonts/arvo-v10-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('../fonts/arvo-v10-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* arvo-700 - latin */
+@font-face {
+  font-family: 'Arvo';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Arvo Bold'), local('Arvo-Bold'),
+       url('../fonts/arvo-v10-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('../fonts/arvo-v10-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* source-code-pro-regular - latin */
+@font-face {
+  font-family: 'Source Code Pro';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Source Code Pro'), local('SourceCodePro-Regular'),
+       url('../fonts/source-code-pro-v7-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('../fonts/source-code-pro-v7-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* source-code-pro-700 - latin */
+@font-face {
+  font-family: 'Source Code Pro';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Source Code Pro Bold'), local('SourceCodePro-Bold'),
+       url('../fonts/source-code-pro-v7-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('../fonts/source-code-pro-v7-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/static/fonts/arvo-v10-latin-700.woff b/static/fonts/arvo-v10-latin-700.woff
new file mode 100644
index 0000000..322e818
--- /dev/null
+++ b/static/fonts/arvo-v10-latin-700.woff
diff --git a/static/fonts/arvo-v10-latin-700.woff2 b/static/fonts/arvo-v10-latin-700.woff2
new file mode 100644
index 0000000..f67096a
--- /dev/null
+++ b/static/fonts/arvo-v10-latin-700.woff2
diff --git a/static/fonts/arvo-v10-latin-regular.woff b/static/fonts/arvo-v10-latin-regular.woff
new file mode 100644
index 0000000..939cdf2
--- /dev/null
+++ b/static/fonts/arvo-v10-latin-regular.woff
diff --git a/static/fonts/arvo-v10-latin-regular.woff2 b/static/fonts/arvo-v10-latin-regular.woff2
new file mode 100644
index 0000000..f03ba83
--- /dev/null
+++ b/static/fonts/arvo-v10-latin-regular.woff2
diff --git a/static/fonts/source-code-pro-v7-latin-700.woff b/static/fonts/source-code-pro-v7-latin-700.woff
new file mode 100644
index 0000000..700601a
--- /dev/null
+++ b/static/fonts/source-code-pro-v7-latin-700.woff
diff --git a/static/fonts/source-code-pro-v7-latin-700.woff2 b/static/fonts/source-code-pro-v7-latin-700.woff2
new file mode 100644
index 0000000..c3eb153
--- /dev/null
+++ b/static/fonts/source-code-pro-v7-latin-700.woff2
diff --git a/static/fonts/source-code-pro-v7-latin-regular.woff b/static/fonts/source-code-pro-v7-latin-regular.woff
new file mode 100644
index 0000000..273f145
--- /dev/null
+++ b/static/fonts/source-code-pro-v7-latin-regular.woff
diff --git a/static/fonts/source-code-pro-v7-latin-regular.woff2 b/static/fonts/source-code-pro-v7-latin-regular.woff2
new file mode 100644
index 0000000..6817019
--- /dev/null
+++ b/static/fonts/source-code-pro-v7-latin-regular.woff2