Skip to content

Commit

Permalink
use @fortawesome/fontawesome-free
Browse files Browse the repository at this point in the history
  • Loading branch information
qftgtr committed Jul 10, 2020
1 parent 0ec99ee commit e3773fd
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@babel/plugin-proposal-class-properties": "^7.5.5",
"@babel/polyfill": "^7.6.0",
"@babel/preset-typescript": "^7.6.0",
"@fortawesome/fontawesome-pro": "^5.12.0",
"@fortawesome/fontawesome-free": "^5.12.0",
"@hot-loader/react-dom": "^16.9.0",
"@polkadot/api": "^0.96.1",
"@types/jest": "24.0.15",
Expand Down
6 changes: 5 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ fileOps.fsType = 'electron'

import('./scss/fonts/open_sans.css')
import('./scss/fonts/hack.css')
import('@fortawesome/fontawesome-pro/js/all')
try {
require('@fortawesome/fontawesome-pro/js/all')
} catch (e) {
require('@fortawesome/fontawesome-free/js/all')
}

document.title = process.env.PROJECT_NAME
ReactDOM.render(<App />, document.getElementById('root'))
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2011,10 +2011,10 @@
resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==

"@fortawesome/fontawesome-pro@^5.12.0":
version "5.12.0"
resolved "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/5.12.0/fontawesome-pro-5.12.0.tgz#a9116c8c832ca1d1a9747ca48d3f9c596028fd46"
integrity sha512-EKKR4p0higjsIPKjSSkGqtweUwo/GgR/zKL4rCwzF5Z/BZ/ebJZaS8ZjGE7YUNEN63SYk2WhpJVI+l9dwfU7RQ==
"@fortawesome/fontawesome-free@^5.12.0":
version "5.13.1"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.13.1.tgz#c53b4066edae16cd1fd669f687baf031b45fb9d6"
integrity sha512-D819f34FLHeBN/4xvw0HR0u7U2G7RqjPSggXqf7LktsxWQ48VAfGwvMrhcVuaZV2fF069c/619RdgCCms0DHhw==

"@hapi/[email protected]":
version "2.1.4"
Expand Down

0 comments on commit e3773fd

Please sign in to comment.