From 8c974e6c1aa92d7d80122c783f4507376aba3a46 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 2 Feb 2015 16:02:58 -0500 Subject: [PATCH] Add Fira font --- UI/WebServerResources/Gruntfile.js | 5 +++-- UI/WebServerResources/bower.json | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/UI/WebServerResources/Gruntfile.js b/UI/WebServerResources/Gruntfile.js index 987bd8a9b..2b5339cbe 100644 --- a/UI/WebServerResources/Gruntfile.js +++ b/UI/WebServerResources/Gruntfile.js @@ -5,7 +5,7 @@ module.exports = function(grunt) { sass: { options: { loadPath: ['scss'], - style: 'expanded' + style: 'nested' }, dist: { files: { @@ -65,7 +65,8 @@ module.exports = function(grunt) { grunt.log.subhead('Copying font files'); var fonts = [ '<%= src %>/ionic/release/fonts/ionicons.*', - '<%= src %>/material-design-iconic-font/fonts/Material-Design-Iconic-Font.*' + '<%= src %>/material-design-iconic-font/fonts/Material-Design-Iconic-Font.*', + '<%= src %>/fira/{eot,ttf,woff}/*' ]; for (var j = 0; j < fonts.length; j++) { var files = grunt.file.expand(grunt.template.process(fonts[j], {data: options})); diff --git a/UI/WebServerResources/bower.json b/UI/WebServerResources/bower.json index 715dbd7bb..b17cacadd 100644 --- a/UI/WebServerResources/bower.json +++ b/UI/WebServerResources/bower.json @@ -13,6 +13,7 @@ "material-design-iconic-font": "~1", "ng-tags-input": "~2", "compass-mixins": "~0.12.3", + "fira": ">=0", "foundation": ">5.3", "ionic": "1.0.0-beta.14", "underscore": "~1"