Skip to content

Commit

Permalink
fix: 🐛 remove font-awesome
Browse files Browse the repository at this point in the history
Closes: #775
  • Loading branch information
siriwatknp committed May 13, 2020
1 parent a08b8b4 commit c2d21cb
Show file tree
Hide file tree
Showing 7 changed files with 1,944 additions and 1,594 deletions.
4 changes: 2 additions & 2 deletions _templates/ci/production/websiteApp.ejs.t
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
inject: true
to: website/src/App.js
after: ./fontawesome
after: // fontawesome
---
import './fontawesome-pro';
import './fontawesome';
3 changes: 3 additions & 0 deletions _templates/ci/production/websitePackage.ejs.t
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@ inject: true
to: website/package.json
after: "dependencies"
---
"@fortawesome/fontawesome-svg-core": "^1.2.25",
"@fortawesome/free-brands-svg-icons": "^5.11.2",
"@fortawesome/free-solid-svg-icons": "^5.13.0",
"@fortawesome/pro-duotone-svg-icons": "^5.13.0",
"@fortawesome/pro-solid-svg-icons": "^5.13.0",
4 changes: 1 addition & 3 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
"build-storybook": "NODE_ENV=production build-storybook -s public"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.25",
"@fortawesome/free-brands-svg-icons": "^5.11.2",
"@fortawesome/free-solid-svg-icons": "^5.13.0",
"@fortawesome/fontawesome-svg-core": "^1.2.28",
"@fortawesome/react-fontawesome": "^0.1.8",
"@material-ui/core": "^4.8.3",
"@material-ui/icons": "^4.5.1",
Expand Down
3 changes: 2 additions & 1 deletion website/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import createPath, { muiTreasuryScheme } from './modules/path';
import 'prismjs/themes/prism-tomorrow.css';
import 'prismjs/plugins/line-numbers/prism-line-numbers.css';
import './global.css';
import './fontawesome';

// font-awesome

const App = ({ children, location }) => {
const path = React.useMemo(() => createPath(location), [location]);
Expand Down
20 changes: 0 additions & 20 deletions website/src/fontawesome-pro.js

This file was deleted.

23 changes: 22 additions & 1 deletion website/src/fontawesome.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,26 @@ import {
faFacebookF,
faFacebook,
} from '@fortawesome/free-brands-svg-icons';
import {
faFighterJet,
faDiceD8,
faSparkles,
faCubes,
faCity,
faThumbsUp,
} from '@fortawesome/pro-duotone-svg-icons';
import { faEnvelope } from '@fortawesome/pro-solid-svg-icons';

library.add(faFacebook, faTwitter, faGithub, faFacebookF);
library.add(
faFacebook,
faTwitter,
faGithub,
faFacebookF,
faFighterJet,
faDiceD8,
faSparkles,
faCubes,
faCity,
faThumbsUp,
faEnvelope
);

0 comments on commit c2d21cb

Please sign in to comment.