diff --git a/assets/fonts/Assistant-Bold.ttf b/assets/fonts/Assistant-Bold.ttf new file mode 100644 index 0000000..4a58b5b Binary files /dev/null and b/assets/fonts/Assistant-Bold.ttf differ diff --git a/assets/fonts/Assistant-Bold.woff b/assets/fonts/Assistant-Bold.woff new file mode 100644 index 0000000..7a5a3bf Binary files /dev/null and b/assets/fonts/Assistant-Bold.woff differ diff --git a/assets/fonts/Assistant-Bold.woff2 b/assets/fonts/Assistant-Bold.woff2 new file mode 100644 index 0000000..f846db5 Binary files /dev/null and b/assets/fonts/Assistant-Bold.woff2 differ diff --git a/assets/fonts/Assistant-Light.ttf b/assets/fonts/Assistant-Light.ttf new file mode 100644 index 0000000..4a333fc Binary files /dev/null and b/assets/fonts/Assistant-Light.ttf differ diff --git a/assets/fonts/Assistant-Light.woff b/assets/fonts/Assistant-Light.woff new file mode 100644 index 0000000..ce70407 Binary files /dev/null and b/assets/fonts/Assistant-Light.woff differ diff --git a/assets/fonts/Assistant-Light.woff2 b/assets/fonts/Assistant-Light.woff2 new file mode 100644 index 0000000..a353ca0 Binary files /dev/null and b/assets/fonts/Assistant-Light.woff2 differ diff --git a/bower.json b/bower.json index dcf9cae..b172851 100644 --- a/bower.json +++ b/bower.json @@ -14,11 +14,9 @@ "moment": "~2.13.0", "requirejs": "~2.2.0", "tablesort": "https://github.com/tristen/tablesort.git#v4.0.1", - "roboto-slab-fontface-kit": "*", "es6-shim": "~0.35.1", "almond": "~0.3.2", "d3": "~3.5.17", - "roboto-fontface": "~0.5.0", "virtual-dom": "~2.1.1", "rbush": "https://github.com/mourner/rbush.git#~1.4.3" }, diff --git a/lib/forcegraph.js b/lib/forcegraph.js index d454612..3a8c44c 100644 --- a/lib/forcegraph.js +++ b/lib/forcegraph.js @@ -696,12 +696,12 @@ define(["d3", "helper"], function (d3, helper) { var buffer = document.createElement("canvas"); var r = window.devicePixelRatio; var bctx = buffer.getContext("2d"); - bctx.font = "11px Roboto, sans-serif"; + bctx.font = "11px Assistant, sans-serif"; var width = bctx.measureText(name).width; var scale = zoomBehavior.scaleExtent()[1] * r; buffer.width = (width + 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.textBaseline = "middle"; bctx.textAlign = "center"; diff --git a/lib/map/labelslayer.js b/lib/map/labelslayer.js index e525d65..73fdb97 100644 --- a/lib/map/labelslayer.js +++ b/lib/map/labelslayer.js @@ -11,7 +11,7 @@ define(["leaflet", "rbush"], ["center", "ideographic", 2 / 8], ["right", "ideographic", 3 / 8]]; - var fontFamily = "Roboto, sans-serif"; + var fontFamily = "Assistant, sans-serif"; var nodeRadius = 4; var ctx = document.createElement("canvas").getContext("2d"); diff --git a/scss/modules/_tabs.scss b/scss/modules/_tabs.scss index c4bb47e..60f2781 100644 --- a/scss/modules/_tabs.scss +++ b/scss/modules/_tabs.scss @@ -8,7 +8,6 @@ background: transparentize($color-black, .98); display: flex; display: -webkit-flex; - font-family: $font-family-secondary; list-style: none; margin: 0; padding: 0; diff --git a/scss/modules/_variables.scss b/scss/modules/_variables.scss index b2b53c2..874a846 100644 --- a/scss/modules/_variables.scss +++ b/scss/modules/_variables.scss @@ -11,8 +11,7 @@ $color-online: #1566a9 !default; $color-offline: #cf3e2a !default; $color-unseen: #d89100 !default; -$font-family: 'Roboto Slab', serif !default; -$font-family-secondary: Roboto, sans-serif !default; +$font-family: Assistant, sans-serif !default; $font-family-icons: ionicons !default; $font-family-monospace: monospace !default; $font-size: 15px !default; diff --git a/scss/modules/font/_font.scss b/scss/modules/font/_font.scss index a051b43..0f915e0 100644 --- a/scss/modules/font/_font.scss +++ b/scss/modules/font/_font.scss @@ -1,7 +1,6 @@ $font-path: 'fonts'; @if $use-included-font == 1 { - @include load-font('Roboto', 'Regular', 400, normal); - @include load-font('RobotoSlab', 'Regular', 400, normal, 'Roboto Slab'); - @include load-font('RobotoSlab', 'Bold', 700, normal, 'Roboto Slab'); + @include load-font('Assistant', 'Light', 300, normal); + @include load-font('Assistant', 'Bold', 700, normal); } diff --git a/tasks/build.js b/tasks/build.js index e632088..6a4833a 100644 --- a/tasks/build.js +++ b/tasks/build.js @@ -23,28 +23,17 @@ module.exports = function (grunt) { cwd: ".", 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: { src: ["fonts/*"], expand: true, dest: "build/", cwd: "assets/icons/" + }, + assistantFont: { + src: ["fonts/*"], + expand: true, + dest: "build/", + cwd: "assets/" } }, sass: {