diff --git a/layouts/partials/meta-terms.html b/layouts/partials/meta-terms.html
index 903496a..6623e5a 100644
--- a/layouts/partials/meta-terms.html
+++ b/layouts/partials/meta-terms.html
@@ -1,8 +1,8 @@
{{ if .Params.categories }}
- {{ range $index, $category := .Params.categories }}{{ if gt $index 0 }}{{ i18n "comma" }} {{ end }}{{ . }}{{ end }}
+ {{ range $index, $category := .Params.categories }}{{ if gt $index 0 }}{{ i18n "comma" }} {{ end }}{{ . }}{{ end }}
{{ end }}
{{ if .Params.tags }}
- {{ range $index, $tag := .Params.tags }}{{ if gt $index 0 }}{{ i18n "comma" }} {{ end }}{{ . }}{{ end }}
+ {{ range $index, $tag := .Params.tags }}{{ if gt $index 0 }}{{ i18n "comma" }} {{ end }}{{ . }}{{ end }}
{{ end }}
{{- /* vim: set ts=2 sw=2 et: */}}
diff --git a/layouts/partials/sharing-icons.html b/layouts/partials/sharing-icons.html
index 2f3575e..2ec6d85 100644
--- a/layouts/partials/sharing-icons.html
+++ b/layouts/partials/sharing-icons.html
@@ -1,9 +1,9 @@
{{ i18n "share" }}
diff --git a/package-lock.json b/package-lock.json
index 19ff8a2..7168ae6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,12 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+ "@fortawesome/fontawesome-free": {
+ "version": "5.12.0",
+ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.12.0.tgz",
+ "integrity": "sha512-vKDJUuE2GAdBERaQWmmtsciAMzjwNrROXA5KTGSZvayAsmuTGjam5z6QNqNPCwDfVljLWuov1nEC3mEQf/n6fQ==",
+ "dev": true
+ },
"abbrev": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -396,12 +402,6 @@
}
}
},
- "font-awesome": {
- "version": "4.7.0",
- "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
- "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=",
- "dev": true
- },
"forever-agent": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
diff --git a/package.json b/package.json
index 9ef1bac..6310550 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
"scripts": {
"build:css": "node-sass --output-style expanded --precision 6 source/scss/style.scss assets/css/style.css.tmp && cleancss --level 1 assets/css/style.css.tmp -o assets/css/style.css",
"build:rtlcss": "rtlcss -s assets/css/style.css.tmp assets/css/style.rtl.css.tmp && cleancss --level 1 assets/css/style.rtl.css.tmp -o assets/css/style.rtl.css",
- "build:fonts": "cp node_modules/font-awesome/fonts/* static/fonts",
+ "build:fonts": "cp node_modules/@fortawesome/fontawesome-free/webfonts/* static/webfonts",
"build:cookieconsent": "cp node_modules/cookieconsent/build/cookieconsent.min.css assets/css && cp node_modules/cookieconsent/build/cookieconsent.min.js assets/js",
"build": "npm run build:css && npm run build:rtlcss && npm run build:fonts && npm run build:cookieconsent && npm run clean",
"clean": "rm assets/css/style.css.tmp assets/css/style.rtl.css.tmp"
@@ -21,7 +21,7 @@
"bootstrap": "~4.4.1",
"clean-css-cli": "^4.3.0",
"cookieconsent": "3.0.4",
- "font-awesome": "^4.7.0",
+ "@fortawesome/fontawesome-free": "^5.12.0",
"node-sass": "^4.13.1",
"rtlcss": "^2.4.1"
}
diff --git a/source/scss/font-awesome.scss b/source/scss/font-awesome.scss
deleted file mode 100644
index ec246d0..0000000
--- a/source/scss/font-awesome.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
- * Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
- * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */
-
-@import "node_modules/font-awesome/scss/variables";
-@import "node_modules/font-awesome/scss/mixins";
-@import "node_modules/font-awesome/scss/path";
-@import "node_modules/font-awesome/scss/core";
-@import "node_modules/font-awesome/scss/larger";
-@import "node_modules/font-awesome/scss/fixed-width";
-//@import "list";
-//@import "bordered-pulled";
-//@import "animated";
-//@import "rotated-flipped";
-//@import "stacked";
-//@import "icons";
-// selectively import icons we need from font-awesome
-// see: node_modules/font-awesome/scss/_icons.scss
-.#{$fa-css-prefix}-tag:before { content: $fa-var-tag; }
-.#{$fa-css-prefix}-folder:before { content: $fa-var-folder; }
-.#{$fa-css-prefix}-facebook:before { content: $fa-var-facebook; }
-.#{$fa-css-prefix}-linkedin:before { content: $fa-var-linkedin; }
-.#{$fa-css-prefix}-rss:before { content: $fa-var-rss; }
-.#{$fa-css-prefix}-rss-square:before { content: $fa-var-rss-square; }
-.#{$fa-css-prefix}-twitter:before { content: $fa-var-twitter; }
-.#{$fa-css-prefix}-y-combinator-square:before,
-.#{$fa-css-prefix}-yc-square:before,
-.#{$fa-css-prefix}-hacker-news:before { content: $fa-var-hacker-news; }
-.#{$fa-css-prefix}-reddit:before { content: $fa-var-reddit; }
-.#{$fa-css-prefix}-reddit-square:before { content: $fa-var-reddit-square; }
-.#{$fa-css-prefix}-stumbleupon-circle:before { content: $fa-var-stumbleupon-circle; }
-.#{$fa-css-prefix}-stumbleupon:before { content: $fa-var-stumbleupon; }
-@import "node_modules/font-awesome/scss/screen-reader";
diff --git a/source/scss/fontawesome.scss b/source/scss/fontawesome.scss
new file mode 100644
index 0000000..ab2d6b6
--- /dev/null
+++ b/source/scss/fontawesome.scss
@@ -0,0 +1,41 @@
+/*!
+ * Font Awesome Free 5.12.0 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 'node_modules/@fortawesome/fontawesome-free/scss/variables';
+@import 'node_modules/@fortawesome/fontawesome-free/scss/mixins';
+@import 'node_modules/@fortawesome/fontawesome-free/scss/core';
+@import 'node_modules/@fortawesome/fontawesome-free/scss/larger';
+//@import 'fixed-width';
+//@import 'list';
+//@import 'bordered-pulled';
+//@import 'animated';
+//@import 'rotated-flipped';
+//@import 'stacked';
+//@import 'icons';
+
+// selectively import icons we need from fontawesome
+// see: node_modules/@fortawesome/fontawesome-free/scss/_icons.scss
+.#{$fa-css-prefix}-tag:before { content: fa-content($fa-var-tag); }
+.#{$fa-css-prefix}-folder:before { content: fa-content($fa-var-folder); }
+.#{$fa-css-prefix}-facebook:before { content: fa-content($fa-var-facebook); }
+.#{$fa-css-prefix}-facebook-f:before { content: fa-content($fa-var-facebook-f); }
+.#{$fa-css-prefix}-linkedin:before { content: fa-content($fa-var-linkedin); }
+.#{$fa-css-prefix}-linkedin-in:before { content: fa-content($fa-var-linkedin-in); }
+.#{$fa-css-prefix}-rss:before { content: fa-content($fa-var-rss); }
+.#{$fa-css-prefix}-rss-square:before { content: fa-content($fa-var-rss-square); }
+.#{$fa-css-prefix}-twitch:before { content: fa-content($fa-var-twitch); }
+.#{$fa-css-prefix}-twitter:before { content: fa-content($fa-var-twitter); }
+.#{$fa-css-prefix}-y-combinator-square:before,
+.#{$fa-css-prefix}-yc-square:before,
+.#{$fa-css-prefix}-hacker-news:before { content: fa-content($fa-var-hacker-news); }
+.#{$fa-css-prefix}-reddit:before { content: fa-content($fa-var-reddit); }
+.#{$fa-css-prefix}-reddit-square:before { content: fa-content($fa-var-reddit-square); }
+.#{$fa-css-prefix}-stumbleupon-circle:before { content: fa-content($fa-var-stumbleupon-circle); }
+.#{$fa-css-prefix}-stumbleupon:before { content: fa-content($fa-var-stumbleupon); }
+
+//@import 'screen-reader';
+
+// import webfont files for solid and brand icons
+@import 'node_modules/@fortawesome/fontawesome-free/scss/solid';
+@import 'node_modules/@fortawesome/fontawesome-free/scss/brands';
diff --git a/source/scss/style.scss b/source/scss/style.scss
index 0b3a6dc..5216df8 100644
--- a/source/scss/style.scss
+++ b/source/scss/style.scss
@@ -1,6 +1,6 @@
-// selectively import components we need from font-awesome
-// see: node_modules/font-awesome/scss/font-awesome.scss
-@import 'source/scss/font-awesome';
+// selectively import components we need from fontawesome
+// see: node_modules/@fortawesome/fontawesome-free/scss/fontawesome.scss
+@import 'source/scss/fontawesome';
// selectively import components we need from bootstrap
// see: node_modules/bootstrap/scss/bootstrap.scss
diff --git a/static/fonts/FontAwesome.otf b/static/fonts/FontAwesome.otf
deleted file mode 100644
index 401ec0f..0000000
Binary files a/static/fonts/FontAwesome.otf and /dev/null differ
diff --git a/static/fonts/fontawesome-webfont.eot b/static/fonts/fontawesome-webfont.eot
deleted file mode 100644
index e9f60ca..0000000
Binary files a/static/fonts/fontawesome-webfont.eot and /dev/null differ
diff --git a/static/fonts/fontawesome-webfont.svg b/static/fonts/fontawesome-webfont.svg
deleted file mode 100644
index 855c845..0000000
--- a/static/fonts/fontawesome-webfont.svg
+++ /dev/null
@@ -1,2671 +0,0 @@
-
-
-
diff --git a/static/fonts/fontawesome-webfont.ttf b/static/fonts/fontawesome-webfont.ttf
deleted file mode 100644
index 35acda2..0000000
Binary files a/static/fonts/fontawesome-webfont.ttf and /dev/null differ
diff --git a/static/fonts/fontawesome-webfont.woff b/static/fonts/fontawesome-webfont.woff
deleted file mode 100644
index 400014a..0000000
Binary files a/static/fonts/fontawesome-webfont.woff and /dev/null differ
diff --git a/static/fonts/fontawesome-webfont.woff2 b/static/fonts/fontawesome-webfont.woff2
deleted file mode 100644
index 4d13fc6..0000000
Binary files a/static/fonts/fontawesome-webfont.woff2 and /dev/null differ
diff --git a/static/webfonts/fa-brands-400.eot b/static/webfonts/fa-brands-400.eot
new file mode 100644
index 0000000..baf4057
Binary files /dev/null and b/static/webfonts/fa-brands-400.eot differ
diff --git a/static/webfonts/fa-brands-400.svg b/static/webfonts/fa-brands-400.svg
new file mode 100644
index 0000000..843c1c7
--- /dev/null
+++ b/static/webfonts/fa-brands-400.svg
@@ -0,0 +1,3535 @@
+
+
+
+
diff --git a/static/webfonts/fa-brands-400.ttf b/static/webfonts/fa-brands-400.ttf
new file mode 100644
index 0000000..9916328
Binary files /dev/null and b/static/webfonts/fa-brands-400.ttf differ
diff --git a/static/webfonts/fa-brands-400.woff b/static/webfonts/fa-brands-400.woff
new file mode 100644
index 0000000..f9e3bcd
Binary files /dev/null and b/static/webfonts/fa-brands-400.woff differ
diff --git a/static/webfonts/fa-brands-400.woff2 b/static/webfonts/fa-brands-400.woff2
new file mode 100644
index 0000000..51c07ae
Binary files /dev/null and b/static/webfonts/fa-brands-400.woff2 differ
diff --git a/static/webfonts/fa-regular-400.eot b/static/webfonts/fa-regular-400.eot
new file mode 100644
index 0000000..04e25cb
Binary files /dev/null and b/static/webfonts/fa-regular-400.eot differ
diff --git a/static/webfonts/fa-regular-400.svg b/static/webfonts/fa-regular-400.svg
new file mode 100644
index 0000000..f1f7e6c
--- /dev/null
+++ b/static/webfonts/fa-regular-400.svg
@@ -0,0 +1,803 @@
+
+
+
+
diff --git a/static/webfonts/fa-regular-400.ttf b/static/webfonts/fa-regular-400.ttf
new file mode 100644
index 0000000..9c6249c
Binary files /dev/null and b/static/webfonts/fa-regular-400.ttf differ
diff --git a/static/webfonts/fa-regular-400.woff b/static/webfonts/fa-regular-400.woff
new file mode 100644
index 0000000..2873e43
Binary files /dev/null and b/static/webfonts/fa-regular-400.woff differ
diff --git a/static/webfonts/fa-regular-400.woff2 b/static/webfonts/fa-regular-400.woff2
new file mode 100644
index 0000000..a34bd65
Binary files /dev/null and b/static/webfonts/fa-regular-400.woff2 differ
diff --git a/static/webfonts/fa-solid-900.eot b/static/webfonts/fa-solid-900.eot
new file mode 100644
index 0000000..39716a7
Binary files /dev/null and b/static/webfonts/fa-solid-900.eot differ
diff --git a/static/webfonts/fa-solid-900.svg b/static/webfonts/fa-solid-900.svg
new file mode 100644
index 0000000..cfd0e2f
--- /dev/null
+++ b/static/webfonts/fa-solid-900.svg
@@ -0,0 +1,4700 @@
+
+
+
+
diff --git a/static/webfonts/fa-solid-900.ttf b/static/webfonts/fa-solid-900.ttf
new file mode 100644
index 0000000..ac4baa2
Binary files /dev/null and b/static/webfonts/fa-solid-900.ttf differ
diff --git a/static/webfonts/fa-solid-900.woff b/static/webfonts/fa-solid-900.woff
new file mode 100644
index 0000000..23002f8
Binary files /dev/null and b/static/webfonts/fa-solid-900.woff differ
diff --git a/static/webfonts/fa-solid-900.woff2 b/static/webfonts/fa-solid-900.woff2
new file mode 100644
index 0000000..b37f209
Binary files /dev/null and b/static/webfonts/fa-solid-900.woff2 differ