Download as
Browse Code »

Commit e2f24bee5de9efd594c4afd38c17b7698abe49d5

Authored by Leonardo Merlin
1 parent ef175cf6
Exists in master and in 8 other branches css-list, feature-captcha, feature-proposal-vote, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Add open-sans fonts

Showing 2 changed files with 7 additions and 2 deletions   Show diff stats
@@ -12,7 +12,8 @@ @@ -12,7 +12,8 @@
12 "animate.css": "~3.3.0", 12 "animate.css": "~3.3.0",
13 "angular": "~1.4.0", 13 "angular": "~1.4.0",
14 "modernizr": "~2.8.3", 14 "modernizr": "~2.8.3",
15 - "angular-slugify": "~1.0.1" 15 + "angular-slugify": "~1.0.1",
  16 + "open-sans-fontface": "~1.4.2"
16 }, 17 },
17 "devDependencies": { 18 "devDependencies": {
18 "angular-mocks": "~1.4.0" 19 "angular-mocks": "~1.4.0"
@@ -48,6 +48,7 @@ gulp.task('html', ['inject', 'partials'], function () { @@ -48,6 +48,7 @@ gulp.task('html', ['inject', 'partials'], function () {
48 .pipe(jsFilter.restore()) 48 .pipe(jsFilter.restore())
49 .pipe(cssFilter) 49 .pipe(cssFilter)
50 .pipe($.replace('../../bower_components/bootstrap-sass-official/assets/fonts/bootstrap/', '../fonts/')) 50 .pipe($.replace('../../bower_components/bootstrap-sass-official/assets/fonts/bootstrap/', '../fonts/'))
  51 + .pipe($.replace('../../bower_components/open-sans-fontface/fonts/', '../fonts/'))
51 .pipe($.csso()) 52 .pipe($.csso())
52 .pipe(cssFilter.restore()) 53 .pipe(cssFilter.restore())
53 .pipe(assets.restore()) 54 .pipe(assets.restore())
@@ -68,7 +69,10 @@ gulp.task('html', ['inject', 'partials'], function () { @@ -68,7 +69,10 @@ gulp.task('html', ['inject', 'partials'], function () {
68 // Only applies for fonts from bower dependencies 69 // Only applies for fonts from bower dependencies
69 // Custom fonts are handled by the "other" task 70 // Custom fonts are handled by the "other" task
70 gulp.task('fonts', function () { 71 gulp.task('fonts', function () {
71 - return gulp.src($.mainBowerFiles().concat('bower_components/bootstrap-sass-official/assets/fonts/bootstrap/*')) 72 + return gulp.src([
  73 + $.mainBowerFiles().concat('bower_components/bootstrap-sass-official/assets/fonts/bootstrap/*'),
  74 + $.mainBowerFiles().concat('bower_components/open-sans-fontface/fonts/*')
  75 + ])
72 .pipe($.filter('**/*.{eot,svg,ttf,woff,woff2}')) 76 .pipe($.filter('**/*.{eot,svg,ttf,woff,woff2}'))
73 .pipe($.flatten()) 77 .pipe($.flatten())
74 .pipe(gulp.dest(path.join(conf.paths.dist, '/fonts/'))); 78 .pipe(gulp.dest(path.join(conf.paths.dist, '/fonts/')));