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
bower.json
  Diff comments   View file @e2f24be
... ... @@ -12,7 +12,8 @@
12 12 "animate.css": "~3.3.0",
13 13 "angular": "~1.4.0",
14 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 18 "devDependencies": {
18 19 "angular-mocks": "~1.4.0"
... ...
gulp/build.js
  Diff comments   View file @e2f24be
... ... @@ -48,6 +48,7 @@ gulp.task('html', ['inject', 'partials'], function () {
48 48 .pipe(jsFilter.restore())
49 49 .pipe(cssFilter)
50 50 .pipe($.replace('../../bower_components/bootstrap-sass-official/assets/fonts/bootstrap/', '../fonts/'))
  51 + .pipe($.replace('../../bower_components/open-sans-fontface/fonts/', '../fonts/'))
51 52 .pipe($.csso())
52 53 .pipe(cssFilter.restore())
53 54 .pipe(assets.restore())
... ... @@ -68,7 +69,10 @@ gulp.task('html', ['inject', 'partials'], function () {
68 69 // Only applies for fonts from bower dependencies
69 70 // Custom fonts are handled by the "other" task
70 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 76 .pipe($.filter('**/*.{eot,svg,ttf,woff,woff2}'))
73 77 .pipe($.flatten())
74 78 .pipe(gulp.dest(path.join(conf.paths.dist, '/fonts/')));
... ...