diff --git a/html/index.html b/html/index.html
index 76bc02d..e834814 100644
--- a/html/index.html
+++ b/html/index.html
@@ -4,8 +4,8 @@
-
-
+
+
diff --git a/index.html b/index.html
index 7a0a5a4..1fdb406 100644
--- a/index.html
+++ b/index.html
@@ -3,8 +3,8 @@
-
-
+
+
diff --git a/package.json b/package.json
index b540825..7ba6584 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
"almond": "^0.3.3",
"chroma-js": "^0.7.8",
"d3": "^3.5.17",
+ "ionicons": "^2.0.1",
"leaflet": "^0.7.7",
"leaflet-label": "^0.2.1-0",
"leaflet-providers": "^1.5.0",
@@ -32,6 +33,7 @@
"numeraljs": "^1.5.6",
"rbush": "^1.4.3",
"requirejs": "^2.3.2",
+ "roboto-fontface": "^0.10.0",
"tablesort": "3.0.2",
"virtual-dom": "^2.1.1"
},
diff --git a/scss/main.scss b/scss/main.scss
index 47cbed9..2719709 100644
--- a/scss/main.scss
+++ b/scss/main.scss
@@ -70,7 +70,7 @@ $buttondistance: 12pt;
body {
margin: 0;
padding: 0;
- font-family: 'Roboto Slab', serif;
+ font-family: 'Roboto-Slab', serif;
font-size: 11pt;
color: #333;
}
diff --git a/tasks/build.js b/tasks/build.js
index 6a923ac..f74c4e2 100644
--- a/tasks/build.js
+++ b/tasks/build.js
@@ -25,21 +25,15 @@ module.exports = function(grunt) {
cwd: "node_modules/",
dest: "build/vendor/"
},
- robotoSlab: {
- src: [ "fonts/*",
- "roboto-slab-fontface.css"
- ],
- expand: true,
- dest: "build/",
- cwd: "node_modules/roboto-slab-fontface"
- },
roboto: {
- src: [ "fonts/*",
- "roboto-fontface.css"
+ src: [ "fonts/roboto/*",
+ "fonts/roboto-slab/*",
+ "css/roboto/roboto-fontface.css",
+ "css/roboto-slab/roboto-slab-fontface.css"
],
expand: true,
dest: "build/",
- cwd: "node_modules/roboto-fontface"
+ cwd: "node_modules/roboto-fontface/"
},
ionicons: {
src: [ "fonts/*",
diff --git a/yarn.lock b/yarn.lock
index e049dd8..955d05b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1584,6 +1584,11 @@ ini@~1.3.0:
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+ionicons@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-2.0.1.tgz#ca398113293ea870244f538f0aabbd4b5b209a3e"
+ integrity sha1-yjmBEyk+qHAkT1OPCqu9S1sgmj4=
+
is-accessor-descriptor@^0.1.6:
version "0.1.6"
resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -2849,6 +2854,11 @@ rndm@1:
resolved "https://registry.yarnpkg.com/rndm/-/rndm-1.2.0.tgz#f33fe9cfb52bbfd520aa18323bc65db110a1b76c"
integrity sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w=
+roboto-fontface@^0.10.0:
+ version "0.10.0"
+ resolved "https://registry.yarnpkg.com/roboto-fontface/-/roboto-fontface-0.10.0.tgz#7eee40cfa18b1f7e4e605eaf1a2740afb6fd71b0"
+ integrity sha512-OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g==
+
safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.2"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"