From 1efbb933d060e207d5cb06d96524b694c8c550de Mon Sep 17 00:00:00 2001
From: jpellizzari <jordan@weave.works>
Date: Thu, 19 Jan 2017 10:57:09 -0800
Subject: [PATCH] Changed font-awesome imports to use Sass

---
 client/.gitignore                   | 1 -
 client/app/scripts/contrast-main.js | 1 -
 client/app/scripts/main.dev.js      | 1 -
 client/app/scripts/main.js          | 1 -
 client/app/styles/main.scss         | 3 +++
 client/package.json                 | 1 -
 client/webpack.local.config.js      | 3 ++-
 client/webpack.production.config.js | 3 ++-
 8 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/.gitignore b/client/.gitignore
index d011fe0cd..1026d1331 100644
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -2,4 +2,3 @@ node_modules
 build/
 coverage/
 test/*png
-dist/
diff --git a/client/app/scripts/contrast-main.js b/client/app/scripts/contrast-main.js
index fbaafb875..75a4e8b9d 100644
--- a/client/app/scripts/contrast-main.js
+++ b/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';
diff --git a/client/app/scripts/main.dev.js b/client/app/scripts/main.dev.js
index db76f21cb..3616126fc 100644
--- a/client/app/scripts/main.dev.js
+++ b/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';
diff --git a/client/app/scripts/main.js b/client/app/scripts/main.js
index 3cbd03dad..773a44cbb 100644
--- a/client/app/scripts/main.js
+++ b/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';
diff --git a/client/app/styles/main.scss b/client/app/styles/main.scss
index 689ef3cbe..aa112969a 100644
--- a/client/app/styles/main.scss
+++ b/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";
diff --git a/client/package.json b/client/package.json
index d51fd5b5e..b03357eae 100644
--- a/client/package.json
+++ b/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",
diff --git a/client/webpack.local.config.js b/client/webpack.local.config.js
index bd5514744..b66d0f812 100644
--- a/client/webpack.local.config.js
+++ b/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')
     ]
   }
 };
diff --git a/client/webpack.production.config.js b/client/webpack.production.config.js
index e5c4fad37..44997c749 100644
--- a/client/webpack.production.config.js
+++ b/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')
     ]
   }
 };