Skip to content

Commit

Permalink
update font-awesome to 4.7 and use scss instead of css
Browse files Browse the repository at this point in the history
  • Loading branch information
stevenweaver committed Sep 26, 2018
1 parent b77b790 commit 52b55fd
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -26,7 +26,7 @@
"express": "^4.15.4",
"express-busboy": "^2.4.4",
"express-validator": "^2.21.0",
"font-awesome": "^4.4.0",
"font-awesome": "^4.7.0",
"hivtrace-viz": "^0.0.14",
"hyphy-vision": "2.1.4",
"jade": "^1.0.0",
Expand Down
1 change: 1 addition & 0 deletions src/entry.js
Expand Up @@ -9,6 +9,7 @@ window._ = _;
require("./scss/application.scss");
require("phylotree.css");
require("font-awesome/css/font-awesome.css");
require("font-awesome/css/font-awesome.css");
require("blueimp-file-upload");

var hyphyVision = require("hyphy-vision");
Expand Down
3 changes: 2 additions & 1 deletion src/scss/application.scss
@@ -1,6 +1,7 @@
@import "~bootstrap/scss/bootstrap";
@import "~hyphy-vision/dist/application.scss";
@import url("https://use.fontawesome.com/releases/v5.0.9/css/all.css");
@import "variables";
@import "~font-awesome/scss/font-awesome";
@import url("https://fonts.googleapis.com/css?family=Exo+2:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i,800,800i,900,900i|Exo:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i,800,800i,900,900i|Montserrat:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i,800,800i,900,900i|Noto+Sans:400,400i,700,700i|IBM+Plex+Mono:400,500,600,700");

// Hyphy & Datamonkey Colors
Expand Down
1 change: 1 addition & 0 deletions src/scss/variables.scss
@@ -0,0 +1 @@
$fa-font-path: "../../node_modules/font-awesome/fonts";

0 comments on commit 52b55fd

Please sign in to comment.