[TASK] Replace Roboto font with Assistant font

This commit is contained in:
Xaver Maierhofer 2016-06-20 00:38:47 +02:00
parent 3fd4abbda6
commit 83f457fb75
13 changed files with 12 additions and 28 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -14,11 +14,9 @@
"moment": "~2.13.0", "moment": "~2.13.0",
"requirejs": "~2.2.0", "requirejs": "~2.2.0",
"tablesort": "https://github.com/tristen/tablesort.git#v4.0.1", "tablesort": "https://github.com/tristen/tablesort.git#v4.0.1",
"roboto-slab-fontface-kit": "*",
"es6-shim": "~0.35.1", "es6-shim": "~0.35.1",
"almond": "~0.3.2", "almond": "~0.3.2",
"d3": "~3.5.17", "d3": "~3.5.17",
"roboto-fontface": "~0.5.0",
"virtual-dom": "~2.1.1", "virtual-dom": "~2.1.1",
"rbush": "https://github.com/mourner/rbush.git#~1.4.3" "rbush": "https://github.com/mourner/rbush.git#~1.4.3"
}, },

View File

@ -696,12 +696,12 @@ define(["d3", "helper"], function (d3, helper) {
var buffer = document.createElement("canvas"); var buffer = document.createElement("canvas");
var r = window.devicePixelRatio; var r = window.devicePixelRatio;
var bctx = buffer.getContext("2d"); var bctx = buffer.getContext("2d");
bctx.font = "11px Roboto, sans-serif"; bctx.font = "11px Assistant, sans-serif";
var width = bctx.measureText(name).width; var width = bctx.measureText(name).width;
var scale = zoomBehavior.scaleExtent()[1] * r; var scale = zoomBehavior.scaleExtent()[1] * r;
buffer.width = (width + 2 * lineWidth) * scale; buffer.width = (width + 2 * lineWidth) * scale;
buffer.height = (16 + 2 * lineWidth) * scale; buffer.height = (16 + 2 * lineWidth) * scale;
bctx.font = "11px Roboto, sans-serif"; bctx.font = "11px Assistant, sans-serif";
bctx.scale(scale, scale); bctx.scale(scale, scale);
bctx.textBaseline = "middle"; bctx.textBaseline = "middle";
bctx.textAlign = "center"; bctx.textAlign = "center";

View File

@ -11,7 +11,7 @@ define(["leaflet", "rbush"],
["center", "ideographic", 2 / 8], ["center", "ideographic", 2 / 8],
["right", "ideographic", 3 / 8]]; ["right", "ideographic", 3 / 8]];
var fontFamily = "Roboto, sans-serif"; var fontFamily = "Assistant, sans-serif";
var nodeRadius = 4; var nodeRadius = 4;
var ctx = document.createElement("canvas").getContext("2d"); var ctx = document.createElement("canvas").getContext("2d");

View File

@ -8,7 +8,6 @@
background: transparentize($color-black, .98); background: transparentize($color-black, .98);
display: flex; display: flex;
display: -webkit-flex; display: -webkit-flex;
font-family: $font-family-secondary;
list-style: none; list-style: none;
margin: 0; margin: 0;
padding: 0; padding: 0;

View File

@ -11,8 +11,7 @@ $color-online: #1566a9 !default;
$color-offline: #cf3e2a !default; $color-offline: #cf3e2a !default;
$color-unseen: #d89100 !default; $color-unseen: #d89100 !default;
$font-family: 'Roboto Slab', serif !default; $font-family: Assistant, sans-serif !default;
$font-family-secondary: Roboto, sans-serif !default;
$font-family-icons: ionicons !default; $font-family-icons: ionicons !default;
$font-family-monospace: monospace !default; $font-family-monospace: monospace !default;
$font-size: 15px !default; $font-size: 15px !default;

View File

@ -1,7 +1,6 @@
$font-path: 'fonts'; $font-path: 'fonts';
@if $use-included-font == 1 { @if $use-included-font == 1 {
@include load-font('Roboto', 'Regular', 400, normal); @include load-font('Assistant', 'Light', 300, normal);
@include load-font('RobotoSlab', 'Regular', 400, normal, 'Roboto Slab'); @include load-font('Assistant', 'Bold', 700, normal);
@include load-font('RobotoSlab', 'Bold', 700, normal, 'Roboto Slab');
} }

View File

@ -23,28 +23,17 @@ module.exports = function (grunt) {
cwd: ".", cwd: ".",
dest: "build/" dest: "build/"
}, },
robotoSlab: {
src: ["**/*-Regular.*",
"**/*-Bold.*"
],
expand: true,
dest: "build/fonts/",
filter: "isFile",
flatten: true,
cwd: "bower_components/roboto-slab-fontface-kit/fonts"
},
roboto: {
src: ["fonts/*-Regular.*"
],
expand: true,
dest: "build/",
cwd: "bower_components/roboto-fontface"
},
ionicons: { ionicons: {
src: ["fonts/*"], src: ["fonts/*"],
expand: true, expand: true,
dest: "build/", dest: "build/",
cwd: "assets/icons/" cwd: "assets/icons/"
},
assistantFont: {
src: ["fonts/*"],
expand: true,
dest: "build/",
cwd: "assets/"
} }
}, },
sass: { sass: {