Start using fontawesome

looselytyped · Apr 10, 2013 · da6aaed · da6aaed
1 parent 5bc9532
commit da6aaed
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -117,7 +117,8 @@ module.exports = function (grunt) {
         javascriptsDir: '<%= yeoman.app %>/scripts',
         fontsDir: '<%= yeoman.app %>/styles/fonts',
         importPath: '<%= yeoman.app %>/components',
-        relativeAssets: true
+        relativeAssets: true,
+        force: true
       },
       dist: {},
       server: {
@@ -225,7 +226,7 @@ module.exports = function (grunt) {
             '*.{ico,txt}',
             '.htaccess',
             'components/**/*',
-            'images/{,*/}*.{gif,webp}'
+            'images/{,*/}*.{png,gif,webp}'
           ]
         }]
       }

diff --git a/app/images/glyphicons-halflings-white.png b/app/images/glyphicons-halflings-white.png
diff --git a/app/images/glyphicons-halflings.png b/app/images/glyphicons-halflings.png
diff --git a/app/styles/main.scss b/app/styles/main.scss
@@ -1 +1,3 @@
-@import "compass_twitter_bootstrap";
+$fontAwesomePath: "/components/font-awesome/font";
+@import "font-awesome/sass/font-awesome.sass";
+@import "compass_twitter_bootstrap";
diff --git a/component.json b/component.json
@@ -7,7 +7,8 @@
     "es5-shim": "~2.0.5",
     "angular-resource": "~1.0.5",
     "angular-cookies": "~1.0.5",
-    "angular-sanitize": "~1.0.5"
+    "angular-sanitize": "~1.0.5",
+    "font-awesome": "~3.0.2"
   },
   "devDependencies": {
     "angular-mocks": "~1.0.5",