Added google web fonts.

This commit is contained in:
Kyle Spearrin 2016-10-25 21:13:59 -04:00
parent c982667338
commit 0e2e17f2e7
5 changed files with 21 additions and 4 deletions

1
.gitignore vendored
View File

@ -5,6 +5,7 @@ npm-debug.log
lib/
css/
dist/
webfonts/
*.crx
*.pem
*.zip

View File

@ -8,7 +8,8 @@
jshint = require('gulp-jshint'),
merge = require('merge-stream'),
browserify = require('browserify'),
source = require('vinyl-source-stream');
source = require('vinyl-source-stream'),
googleWebFonts = require('gulp-google-webfonts');
var paths = {};
paths.dist = './dist/';
@ -17,6 +18,7 @@ paths.npmDir = './node_modules/';
paths.popupDir = './src/popup/';
paths.lessDir = paths.popupDir + 'less/';
paths.cssDir = paths.popupDir + 'css/';
paths.webfontsDir = './src/webfonts/';
gulp.task('lint', function () {
return gulp.src(paths.popupDir + 'app/**/*.js')
@ -27,7 +29,7 @@ gulp.task('lint', function () {
gulp.task('build', function (cb) {
return runSequence(
'clean',
['browserify', 'lib', 'less', 'lint'],
['browserify', 'lib', 'less', 'lint', 'webfonts'],
cb);
});
@ -39,7 +41,11 @@ gulp.task('clean:lib', function (cb) {
return rimraf(paths.libDir, cb);
});
gulp.task('clean', ['clean:css', 'clean:lib']);
gulp.task('clean:fonts', function (cb) {
return rimraf(paths.webfontsDir, cb);
});
gulp.task('clean', ['clean:css', 'clean:lib', 'clean:fonts']);
gulp.task('lib', ['clean:lib'], function () {
var libs = [
@ -168,3 +174,10 @@ gulp.task('dist', ['build'], function (cb) {
'dist:move',
cb);
});
gulp.task('webfonts', function () {
return gulp.src('./webfonts.list')
.pipe(googleWebFonts({}))
.pipe(gulp.dest(paths.webfontsDir))
;
});

View File

@ -31,6 +31,7 @@
"angulartics-google-analytics": "0.2.1",
"tldjs": "1.7.0",
"browserify": "13.1.0",
"vinyl-source-stream": "1.1.0"
"vinyl-source-stream": "1.1.0",
"gulp-google-webfonts": "0.0.14"
}
}

View File

@ -6,6 +6,7 @@
<title>bitwarden</title>
<link rel="stylesheet" href="../webfonts/fonts.css">
<link rel="stylesheet" href="../lib/font-awesome/css/font-awesome.css">
<link rel="stylesheet" href="../lib/angular-toastr/angular-toastr.css">
<link rel="stylesheet" href="../lib/sweetalert/sweetalert.css">

1
webfonts.list Normal file
View File

@ -0,0 +1 @@
Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i&subset=cyrillic,cyrillic-ext,greek,greek-ext,latin-ext