diff --git a/Makefile b/Makefile index d8ca6d5..8657230 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,6 @@ build: install hugo gen chromastyles --style=monokai > $(STATIC_SRC)/scss/highlight.css $(NODE_BIN)/browserify $(STATIC_SRC)/js/index.js -o $(STATIC_BUILD)/js/app.js $(NODE_BIN)/node-sass $(STATIC_SRC)/scss/style.scss $(STATIC_BUILD)/css/style.css --source-map-embed - cp -r $(BASEDIR)/node_modules/font-awesome/fonts $(STATIC_BUILD)/fonts cp -r $(BASEDIR)/node_modules/lightgallery/dist/fonts $(STATIC_BUILD) cp -r $(STATIC_SRC)/img $(STATIC_BUILD)/img @hugo -vDEF --stepAnalysis diff --git a/data/social.yml b/data/social.yml index b5c6fab..2cfb6b2 100644 --- a/data/social.yml +++ b/data/social.yml @@ -4,67 +4,67 @@ accounts: name: GitHub username: RealOrangeOne link: https://github.com/RealOrangeOne/ - icon: fa-github + icon: fab fa-github twitter: name: Twitter username: RealOrangeOne link: https://twitter.com/RealOrangeOne/ - icon: fa-twitter + icon: fab fa-twitter reddit: name: Reddit username: RealOrangeOne link: https://reddit.com/u/RealOrangeOne/ - icon: fa-reddit + icon: fab fa-reddit flickr: name: Flickr username: TheOrangeOne link: https://flickr.com/photos/TheOrangeOne/ - icon: fa-flickr + icon: fab fa-flickr bitbucket: name: BitBucket username: TheOrangeOne link: https://bitbucket.com/TheOrangeOne/ - icon: fa-bitbucket + icon: fab fa-bitbucket trello: name: Trello username: TheOrangeOne link: https://trello.com/TheOrangeOne/ - icon: fa-trello + icon: fab fa-trello freenode: name: Freenode username: TheOrangeOne link: https://webchat.freenode.net/ - icon: fa-rss + icon: fas fa-rss pcpartpicker: name: PCPartPicker username: TheOrangeOne link: https://uk.pcpartpicker.com/user/TheOrangeOne/ - icon: fa-desktop + icon: fas fa-desktop codepen: name: CodePen username: TheOrangeOne link: https://codepen.io/TheOrangeOne/ - icon: fa-codepen + icon: fab fa-codepen npm: name: NPM username: TheOrangeOne link: https://www.npmjs.com/~TheOrangeOne/ - icon: fa-file-code-o + icon: fab fa-npm keybase: name: Keybase username: RealOrangeOne link: https://keybase.io/realorangeone - icon: fa-key + icon: fas fa-key footer_accounts: - github diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 0421ced..1748fd4 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -7,10 +7,10 @@
Share this page

- - - - + + + +

{{ end }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 771b14b..16d8b44 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -11,7 +11,7 @@

{{ range .Site.Data.social.footer_accounts }} {{ $account := index $.Site.Data.social.accounts . }} - + {{ end }}

diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html index 72583f9..a9d8d11 100644 --- a/layouts/partials/navbar.html +++ b/layouts/partials/navbar.html @@ -14,7 +14,7 @@ {{ $account := index $.Site.Data.social.accounts . }}
  • - +
    • {{ end }} diff --git a/layouts/shortcodes/pcpartpicker.html b/layouts/shortcodes/pcpartpicker.html index 1cfa8c6..8da6f19 100644 --- a/layouts/shortcodes/pcpartpicker.html +++ b/layouts/shortcodes/pcpartpicker.html @@ -1,6 +1,6 @@

    - + View on PCPartPicker

    diff --git a/layouts/shortcodes/repobutton.html b/layouts/shortcodes/repobutton.html index 159894c..0b239c3 100644 --- a/layouts/shortcodes/repobutton.html +++ b/layouts/shortcodes/repobutton.html @@ -1,5 +1,5 @@ {{ $repo := default (.Get 0) .Page.Params.repo }} - View on GitHub + View on GitHub diff --git a/layouts/shortcodes/social_list.html b/layouts/shortcodes/social_list.html index 620f9c2..04d2b8f 100644 --- a/layouts/shortcodes/social_list.html +++ b/layouts/shortcodes/social_list.html @@ -2,7 +2,7 @@ {{ range $i, $e := sort .Site.Data.social.accounts "name" }}
    -

    +

    {{ $e.name }}

    diff --git a/package.json b/package.json index 1175367..b02d61f 100644 --- a/package.json +++ b/package.json @@ -18,9 +18,12 @@ "yaml-lint": "1.0.0" }, "dependencies": { + "@fortawesome/fontawesome": "1.1.0", + "@fortawesome/fontawesome-free-brands": "5.0.2", + "@fortawesome/fontawesome-free-regular": "5.0.2", + "@fortawesome/fontawesome-free-solid": "5.0.2", "bootstrap": "4.0.0-beta.2", "clipboard": "1.7.1", - "font-awesome": "4.7.0", "jquery": "3.2.1", "lg-thumbnail": "1.1.0", "lightgallery": "1.6.4", diff --git a/static/src/js/fa.js b/static/src/js/fa.js new file mode 100644 index 0000000..dbe4772 --- /dev/null +++ b/static/src/js/fa.js @@ -0,0 +1,12 @@ +var fontawesome = require('@fortawesome/fontawesome'); +var solid = require('@fortawesome/fontawesome-free-solid'); +var regular = require('@fortawesome/fontawesome-free-regular'); +var brands = require('@fortawesome/fontawesome-free-brands'); + +try { + fontawesome.library.add(solid); + fontawesome.library.add(regular); + fontawesome.library.add(brands); +} catch (e) { + // Sometimes loading icons raises an exception, even when there's no invalid icons on the screen +} diff --git a/static/src/js/index.js b/static/src/js/index.js index b20dc9c..35cd6e9 100644 --- a/static/src/js/index.js +++ b/static/src/js/index.js @@ -1,6 +1,7 @@ 'use strict'; require('./jquery-global'); +require('./fa'); require('bootstrap'); @@ -55,7 +56,7 @@ $('.navbar-brand').on('click', function (event) { var clipboard = new Clipboard('a'); clipboard.on('success', function (e) { var ele = $(e.trigger); - ele.find('i').attr('class', 'fa fa-check'); + ele.find('i').attr('class', 'fas fa-check'); ele.attr('title', 'Copied!'); }); diff --git a/static/src/scss/style.scss b/static/src/scss/style.scss index 247f2ef..5d14eba 100644 --- a/static/src/scss/style.scss +++ b/static/src/scss/style.scss @@ -1,6 +1,3 @@ -$fa-font-path: "../fonts"; -@import "node_modules/font-awesome/scss/font-awesome"; - @import "variables"; @import "highlight"; // Generated by Hugo