Changed font-awesome imports to use Sass

client/.gitignore

@@ -2,4 +2,3 @@ node_modules
 build/
 coverage/
 test/*png
-dist/

client/app/scripts/contrast-main.js

@@ -1,5 +1,4 @@
 import 'babel-polyfill';
-import 'font-awesome-webpack';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';

client/app/scripts/main.dev.js

@@ -1,5 +1,4 @@
 import 'babel-polyfill';
-import 'font-awesome-webpack';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';

client/app/scripts/main.js

@@ -1,5 +1,4 @@
 import 'babel-polyfill';
-import 'font-awesome-webpack';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';

client/app/styles/main.scss

@@ -1,4 +1,7 @@
+// Settings
+$fa-font-path: "~font-awesome/fonts";
 @import '~xterm/dist/xterm.css';
+@import '~font-awesome/scss/font-awesome.scss';
 
 @font-face {
   font-family: "Roboto";

client/package.json

@@ -60,7 +60,6 @@
     "eslint-plugin-react": "6.8.0",
     "extract-text-webpack-plugin": "1.0.1",
     "file-loader": "0.9.0",
-    "font-awesome-webpack": "0.0.4",
     "html-webpack-plugin": "2.24.1",
     "http-proxy-rules": "1.0.1",
     "immutable-devtools": "0.0.7",

client/webpack.local.config.js

@@ -131,7 +131,8 @@ module.exports = {
   },
   sassLoader: {
     includePaths: [
-      path.resolve(__dirname, './node_modules/xterm')
+      path.resolve(__dirname, './node_modules/xterm'),
+      path.resolve(__dirname, './node_modules/font-awesome')
     ]
   }
 };

client/webpack.production.config.js

@@ -132,7 +132,8 @@ module.exports = {
   ],
   sassLoader: {
     includePaths: [
-      path.resolve(__dirname, './node_modules/xterm')
+      path.resolve(__dirname, './node_modules/xterm'),
+      path.resolve(__dirname, './node_modules/font-awesome')
     ]
   }
 };