1
0
mirror of https://github.com/bigchaindb/site.git synced 2024-11-22 09:46:57 +01:00

switch to Noto Sans, kick out Fira

This commit is contained in:
Matthias Kretschmann 2016-02-04 15:08:40 +01:00
parent b12cb56412
commit fb7bf7199b
6 changed files with 9 additions and 14 deletions

Binary file not shown.

Binary file not shown.

View File

@ -3,13 +3,11 @@
// --- // ---
// bigchain.io // bigchain.io
// //
@font-face { @font-face {
font-family: 'Fira Sans'; font-family: 'Noto Sans';
src: local('Fira Sans Regular'), src: local('Noto Sans Regular'),
url('/assets/fonts/FiraSans-Regular.woff2') format('woff2'), url('/assets/fonts/NotoSans-Regular.woff') format('woff'),
url('/assets/fonts/FiraSans-Regular.woff') format('woff'), url('/assets/fonts/NotoSans-Regular.ttf') format('truetype');
url('/assets/fonts/FiraSans-Regular.ttf') format('truetype');
font-weight: 400; font-weight: 400;
font-style: normal; font-style: normal;
} }

View File

@ -30,7 +30,7 @@ $brand-danger: #c9726a !default;
// //
// Typography // 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-avenir: 'Avenir Next', 'Helvetica Neue', 'Arial', sans-serif !default;
$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default; $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default;
$font-family-base: $font-family-avenir !default; $font-family-base: $font-family-avenir !default;
@ -57,7 +57,7 @@ $font-size-h6: 0.85rem !default;
$line-height: 1.5 !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-font-weight: $font-weight-normal !default;
$headings-line-height: 1.2 !default; $headings-line-height: 1.2 !default;
$headings-color: $brand-main-blue-light !default; $headings-color: $brand-main-blue-light !default;
@ -126,7 +126,7 @@ $pre-scrollable-max-height: 340px !default;
// //
// Buttons // Buttons
// //
$btn-font-family: $font-family-avenir; $btn-font-family: $font-family-noto;
$btn-font-weight: $font-weight-normal !default; $btn-font-weight: $font-weight-normal !default;
$btn-padding-x: 2rem !default; $btn-padding-x: 2rem !default;

View File

@ -215,9 +215,7 @@ gulp.task('images', function() {
// Copy Fonts // Copy Fonts
// //
gulp.task('fonts', function() { gulp.task('fonts', function() {
return gulp.src([ return gulp.src(SRC + '_assets/fonts/**/*')
'./node_modules/fira/**/FiraSans-Regular.{eot,ttf,woff,woff2}'
])
.pipe($.rename({dirname: ''})) .pipe($.rename({dirname: ''}))
.pipe(gulp.dest(DIST + 'assets/fonts/')); .pipe(gulp.dest(DIST + 'assets/fonts/'));
}); });

View File

@ -18,8 +18,7 @@
"normalize-opentype.css": ">=0.2.4", "normalize-opentype.css": ">=0.2.4",
"jquery": "^2.1.4", "jquery": "^2.1.4",
"parsleyjs": "^2.0.7", "parsleyjs": "^2.0.7",
"svg4everybody": "^2.0.0", "svg4everybody": "^2.0.0"
"fira": "mozilla/Fira"
}, },
"devDependencies": { "devDependencies": {
"browser-sync": ">=2.10.0", "browser-sync": ">=2.10.0",