From 5cc14bb729733aa729f3ac1484d7aa281880eff7 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 30 Jan 2015 16:31:08 -0500
Subject: [PATCH] Remove reference to bower_components in CSS

---
 UI/WebServerResources/Gruntfile.js            | 43 ++++++++++---------
 .../scss/components/icon/_extends.scss        |  4 +-
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/UI/WebServerResources/Gruntfile.js b/UI/WebServerResources/Gruntfile.js
index 772289450..987bd8a9b 100644
--- a/UI/WebServerResources/Gruntfile.js
+++ b/UI/WebServerResources/Gruntfile.js
@@ -53,7 +53,7 @@ module.exports = function(grunt) {
             '<%= src %>/underscore/underscore-min.{js,map}'
         ];
         for (var j = 0; j < js.length; j++) {
-            var files = grunt.file.expand(grunt.template.process(js[j], {data: options}))
+            var files = grunt.file.expand(grunt.template.process(js[j], {data: options}));
             for (var i = 0; i < files.length; i++) {
                 var src = files[i];
                 var paths = src.split('/');
@@ -63,31 +63,34 @@ module.exports = function(grunt) {
             }
         }
         grunt.log.subhead('Copying font files');
-        var fonts = grunt.file.expand(
-            grunt.template.process('<%= src %>/ionic/release/fonts/ionicons.*',
-                                   {data: options})
-        );
-        for (var i = 0; i < fonts.length; i++) {
-            var src = fonts[i];
-            var paths = src.split('/');
-            var dest = options.fonts_dest + paths[paths.length-1];
-            grunt.file.copy(src, dest);
-            grunt.log.ok("copy " + src + " => " + dest);
+        var fonts = [
+            '<%= src %>/ionic/release/fonts/ionicons.*',
+            '<%= src %>/material-design-iconic-font/fonts/Material-Design-Iconic-Font.*'
+        ];
+        for (var j = 0; j < fonts.length; j++) {
+            var files = grunt.file.expand(grunt.template.process(fonts[j], {data: options}));
+            for (var i = 0; i < files.length; i++) {
+                var src = files[i];
+                var paths = src.split('/');
+                var dest = options.fonts_dest + paths[paths.length-1];
+                grunt.file.copy(src, dest);
+                grunt.log.ok("copy " + src + " => " + dest);
+            }
         }
         grunt.log.subhead('Copying CSS files');
         var css = [
             '<%= src %>/ng-tags-input/ng-tags-input*.css'
         ];
         for (var j = 0; j < css.length; j++) {
-            var files = grunt.file.expand(grunt.template.process(css[j], {data: options}))
-              for (var i = 0; i < files.length; i++) {
-                  var src = files[i];
-                  var paths = src.split('/');
-                  var dest = options.css_dest + paths[paths.length-1];
-                  grunt.file.copy(src, dest);
-                  grunt.log.ok("copy " + src + " => " + dest);
-              }
-          }
+            var files = grunt.file.expand(grunt.template.process(css[j], {data: options}));
+            for (var i = 0; i < files.length; i++) {
+                var src = files[i];
+                var paths = src.split('/');
+                var dest = options.css_dest + paths[paths.length-1];
+                grunt.file.copy(src, dest);
+                grunt.log.ok("copy " + src + " => " + dest);
+            }
+        }
     });
     grunt.task.registerTask('build', ['static', 'sass']);
     grunt.task.registerTask('default', ['build','watch']);
diff --git a/UI/WebServerResources/scss/components/icon/_extends.scss b/UI/WebServerResources/scss/components/icon/_extends.scss
index 59d1482f5..c913102ac 100644
--- a/UI/WebServerResources/scss/components/icon/_extends.scss
+++ b/UI/WebServerResources/scss/components/icon/_extends.scss
@@ -14,8 +14,8 @@ $md-icon-src-path: "../../../bower_components/material-design-iconic-font/scss/"
 @import "../../../bower_components/material-design-iconic-font/scss/_variables";
 // variables in source are not defaulted, we MUST override here
 // relative (to css) path for src fonts
-$md-font-path: "../bower_components/material-design-iconic-font/fonts";
-// the source file declare "md" !!!
+$md-font-path: "../fonts";
+// Set style directive prefix to "md-icon-"
 $md-css-prefix: md-icon;
 @import "../../../bower_components/material-design-iconic-font/scss/_mixins";
 @import "../../../bower_components/material-design-iconic-font/scss/_path";