From cb13a3d5af4da145afd00853576bc2d49e7f8860 Mon Sep 17 00:00:00 2001
From: nixa <4dmitr@gmail.com>
Date: Tue, 26 Apr 2016 15:06:17 +0300
Subject: [PATCH] better fonts import using fontawesome-sass-loader

---
 config/webpack.common.js                | 6 ++----
 package.json                            | 1 +
 src/app/app.scss                        | 2 +-
 src/app/theme/sass/_fonts.scss          | 2 --
 src/app/theme/sass/conf/_variables.scss | 4 ----
 src/app/theme/theme.scss                | 1 -
 src/main.browser.ts                     | 1 +
 7 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 src/app/theme/sass/_fonts.scss

diff --git a/config/webpack.common.js b/config/webpack.common.js
index 96997ace..2d4641ad 100644
--- a/config/webpack.common.js
+++ b/config/webpack.common.js
@@ -132,13 +132,11 @@ module.exports = {
       },
 
       {
-        test: /\.woff(2)?$/,
-        loader: "url-loader?name=/assets/fonts/[name].[ext]&limit=10000&mimetype=application/font-woff"
+        test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "url-loader?limit=10000&mimetype=application/font-woff"
       },
 
       {
-        test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        loader: "file?name=/assets/fonts/[name].[ext]"
+        test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "file-loader"
       },
 
       {
diff --git a/package.json b/package.json
index fb8db540..9552b704 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     "bootstrap-loader": "^1.0.8",
     "core-js": "^2.2.2",
     "font-awesome": "^4.6.1",
+    "font-awesome-sass-loader": "^1.0.1",
     "jquery": "^2.2.3",
     "normalize.css": "^4.1.1",
     "rxjs": "5.0.0-beta.2",
diff --git a/src/app/app.scss b/src/app/app.scss
index 86020591..eed9569d 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -1 +1 @@
-@import "theme/theme";
\ No newline at end of file
+@import "theme/theme";
diff --git a/src/app/theme/sass/_fonts.scss b/src/app/theme/sass/_fonts.scss
deleted file mode 100644
index f95c687f..00000000
--- a/src/app/theme/sass/_fonts.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-// TODO: is this the best way to resolve modules' paths to the file?
-@import "../../../../node_modules/font-awesome/scss/font-awesome.scss";
diff --git a/src/app/theme/sass/conf/_variables.scss b/src/app/theme/sass/conf/_variables.scss
index 3b4a9627..2f8a3df3 100644
--- a/src/app/theme/sass/conf/_variables.scss
+++ b/src/app/theme/sass/conf/_variables.scss
@@ -57,7 +57,3 @@ $font-light: 300;
 $font-normal: 400;
 $font-bold: 700;
 $font-ultraBold: 900;
-
-// overrides default font awesome fonts path
-// not needed in case of copying fonts into assets path
-$fa-font-path: $fonts-root;
diff --git a/src/app/theme/theme.scss b/src/app/theme/theme.scss
index 8728570b..90593f57 100644
--- a/src/app/theme/theme.scss
+++ b/src/app/theme/theme.scss
@@ -1,5 +1,4 @@
 @import "sass/conf/conf";
-@import "sass/fonts";
 @import "sass/bootstrap-overrides/overrides";
 
 @import "sass/blur-admin-theme";
diff --git a/src/main.browser.ts b/src/main.browser.ts
index 0ec5ad03..9b8ff0ef 100644
--- a/src/main.browser.ts
+++ b/src/main.browser.ts
@@ -1,5 +1,6 @@
 import 'jquery';
 import 'bootstrap-loader';
+import 'font-awesome-sass-loader';
 
 /*
  * Providers provided by Angular