diff --git a/_src/_assets/fonts/NotoSans-Regular.ttf b/_src/_assets/fonts/NotoSans-Regular.ttf new file mode 100755 index 0000000..b4d32ef Binary files /dev/null and b/_src/_assets/fonts/NotoSans-Regular.ttf differ diff --git a/_src/_assets/fonts/NotoSans-Regular.woff b/_src/_assets/fonts/NotoSans-Regular.woff new file mode 100755 index 0000000..ec94d08 Binary files /dev/null and b/_src/_assets/fonts/NotoSans-Regular.woff differ diff --git a/_src/_assets/styles/bigchain/_fonts.scss b/_src/_assets/styles/bigchain/_fonts.scss index 008df73..5b2ccb9 100644 --- a/_src/_assets/styles/bigchain/_fonts.scss +++ b/_src/_assets/styles/bigchain/_fonts.scss @@ -3,13 +3,11 @@ // --- // bigchain.io // - @font-face { - font-family: 'Fira Sans'; - src: local('Fira Sans Regular'), - url('/assets/fonts/FiraSans-Regular.woff2') format('woff2'), - url('/assets/fonts/FiraSans-Regular.woff') format('woff'), - url('/assets/fonts/FiraSans-Regular.ttf') format('truetype'); + font-family: 'Noto Sans'; + src: local('Noto Sans Regular'), + url('/assets/fonts/NotoSans-Regular.woff') format('woff'), + url('/assets/fonts/NotoSans-Regular.ttf') format('truetype'); font-weight: 400; font-style: normal; } diff --git a/_src/_assets/styles/bigchain/_variables.scss b/_src/_assets/styles/bigchain/_variables.scss index 1c9dfbd..e16526c 100644 --- a/_src/_assets/styles/bigchain/_variables.scss +++ b/_src/_assets/styles/bigchain/_variables.scss @@ -30,7 +30,7 @@ $brand-danger: #c9726a !default; // // Typography // -$font-family-fira: 'Fira Sans', sans-serif !default; +$font-family-noto: 'Noto Sans', 'Helvetica Neue', 'Arial', sans-serif !default; $font-family-avenir: 'Avenir Next', 'Helvetica Neue', 'Arial', sans-serif !default; $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default; $font-family-base: $font-family-avenir !default; @@ -57,7 +57,7 @@ $font-size-h6: 0.85rem !default; $line-height: 1.5 !default; -$headings-font-family: $font-family-fira !default; +$headings-font-family: $font-family-noto !default; $headings-font-weight: $font-weight-normal !default; $headings-line-height: 1.2 !default; $headings-color: $brand-main-blue-light !default; @@ -126,7 +126,7 @@ $pre-scrollable-max-height: 340px !default; // // Buttons // -$btn-font-family: $font-family-avenir; +$btn-font-family: $font-family-noto; $btn-font-weight: $font-weight-normal !default; $btn-padding-x: 2rem !default; diff --git a/gulpfile.js b/gulpfile.js index 14fae7f..c205d87 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -215,9 +215,7 @@ gulp.task('images', function() { // Copy Fonts // gulp.task('fonts', function() { - return gulp.src([ - './node_modules/fira/**/FiraSans-Regular.{eot,ttf,woff,woff2}' - ]) + return gulp.src(SRC + '_assets/fonts/**/*') .pipe($.rename({dirname: ''})) .pipe(gulp.dest(DIST + 'assets/fonts/')); }); diff --git a/package.json b/package.json index a0426e5..62b11b4 100644 --- a/package.json +++ b/package.json @@ -18,8 +18,7 @@ "normalize-opentype.css": ">=0.2.4", "jquery": "^2.1.4", "parsleyjs": "^2.0.7", - "svg4everybody": "^2.0.0", - "fira": "mozilla/Fira" + "svg4everybody": "^2.0.0" }, "devDependencies": { "browser-sync": ">=2.10.0",