diff --git a/client/app/styles/main.less b/client/app/styles/main.less index 58b88f27d..2dba6430f 100644 --- a/client/app/styles/main.less +++ b/client/app/styles/main.less @@ -1,7 +1,13 @@ @import "~material-ui/src/less/scaffolding.less"; @import "~material-ui/src/less/components.less"; -@import url(http://fonts.googleapis.com/css?family=Roboto:300,400); +@font-face { + font-family: "Roboto"; + src: url("../../node_modules/materialize-css/font/roboto/Roboto-Regular.woff2"), + url("../../node_modules/materialize-css/font/roboto/Roboto-Regular.woff"), + url("../../node_modules/materialize-css/font/roboto/Roboto-Regular.ttf"); +} + .browsehappy { margin: 0.2em 0; diff --git a/client/gulpfile.js b/client/gulpfile.js index 92f2c8491..202bc99ef 100644 --- a/client/gulpfile.js +++ b/client/gulpfile.js @@ -23,13 +23,6 @@ gulp.task('clean', del.bind( null, ['.tmp', 'build/*'], {dot: true} )); -// 3rd party libraries -gulp.task('vendor', function() { - return gulp.src('node_modules/font-awesome/fonts/**') - .pipe($.filter('**/*.{eot,svg,ttf,woff,woff2}')) - .pipe(gulp.dest('build/fonts')); -}); - // Favicon gulp.task('favicon', function() { return gulp.src(['app/favicon.ico']) @@ -86,7 +79,7 @@ gulp.task('bundle', function(cb) { // Build the app from source code gulp.task('build', ['clean'], function(cb) { - runSequence(['vendor', 'html', 'favicon', 'bundle'], cb); + runSequence(['html', 'favicon', 'bundle'], cb); }); // Build and start watching for modifications diff --git a/client/package.json b/client/package.json index 57820cd15..ec8a13d10 100644 --- a/client/package.json +++ b/client/package.json @@ -14,6 +14,7 @@ "keymirror": "^0.1.1", "lodash": "~3.9.3", "material-ui": "~0.7.5", + "materialize-css": "^0.96.1", "object-assign": "^2.0.0", "page": "^1.6.3", "react": "^0.13.3",