Load up fa5 instead of 4

This commit is contained in:
Simon Howe
2018-11-09 13:41:37 +01:00
parent 62d55596c6
commit 52fc460f8e
5 changed files with 8 additions and 8 deletions

1
client/.gitignore vendored
View File

@@ -1,5 +1,6 @@
node_modules
build/
build-external/
coverage/
test/*png
weave-scope.tgz

View File

@@ -1,4 +1,4 @@
@import '~font-awesome/scss/font-awesome.scss';
@import '~@fortawesome/fontawesome-free/css/all.css';
@import '~rc-slider/dist/rc-slider.css';
/* sass-lint:disable variable-for-property */

View File

@@ -1,5 +1,3 @@
$fa-font-path: "~font-awesome/fonts";
$base-ease: ease-in-out;
$background-color: $color-gray-50;

View File

@@ -22,7 +22,6 @@
"debug": "3.1.0",
"filesize": "3.5.11",
"filter-invalid-dom-props": "2.0.0",
"font-awesome": "4.7.0",
"immutable": "3.8.2",
"json-stable-stringify": "1.0.1",
"lcp": "1.1.0",
@@ -49,6 +48,7 @@
"xterm": "3.3.0"
},
"devDependencies": {
"@fortawesome/fontawesome-free": "^5.5.0",
"autoprefixer": "7.1.5",
"babel-cli": "6.26.0",
"babel-core": "6.26.0",

View File

@@ -182,6 +182,11 @@
lodash "^4.2.0"
to-fast-properties "^2.0.0"
"@fortawesome/fontawesome-free@^5.5.0":
version "5.5.0"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.5.0.tgz#0c6c53823d04457ae669cd19567b8a21dbb4fcfd"
integrity sha512-p4lu0jfj5QN013ddArh99r3OXZ/fp9rbovs62LfaO70OMBsAXxtNd0lAq/97fitrscR0fqfd+/a5KNcp6Sh/0A==
"@mrmlnc/readdir-enhanced@^2.2.1":
version "2.2.1"
resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -3319,10 +3324,6 @@ flatten@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
font-awesome@4.7.0:
version "4.7.0"
resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
for-in@^0.1.3:
version "0.1.8"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"