diff --git a/assets/icons/fonts/hopglass.eot b/assets/icons/fonts/hopglass.eot new file mode 100644 index 0000000..c98534a Binary files /dev/null and b/assets/icons/fonts/hopglass.eot differ diff --git a/assets/icons/fonts/hopglass.svg b/assets/icons/fonts/hopglass.svg new file mode 100644 index 0000000..da13e93 --- /dev/null +++ b/assets/icons/fonts/hopglass.svg @@ -0,0 +1,27 @@ + + + +Generated by Fontastic.me + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/icons/fonts/hopglass.ttf b/assets/icons/fonts/hopglass.ttf new file mode 100644 index 0000000..d117d0c Binary files /dev/null and b/assets/icons/fonts/hopglass.ttf differ diff --git a/assets/icons/fonts/hopglass.woff b/assets/icons/fonts/hopglass.woff new file mode 100644 index 0000000..b1a185a Binary files /dev/null and b/assets/icons/fonts/hopglass.woff differ diff --git a/assets/icons/fonts/hopglass.woff2 b/assets/icons/fonts/hopglass.woff2 new file mode 100644 index 0000000..cce2274 Binary files /dev/null and b/assets/icons/fonts/hopglass.woff2 differ diff --git a/assets/icons/hopglass-icons.css b/assets/icons/hopglass-icons.css new file mode 100644 index 0000000..f3ab178 --- /dev/null +++ b/assets/icons/hopglass-icons.css @@ -0,0 +1,92 @@ +@font-face { + font-family: "Ionicons"; + src: url("fonts/hopglass.woff2") format("woff2"), + url("fonts/hopglass.woff") format("woff"), + url("fonts/hopglass.ttf") format("truetype"); + font-weight: normal; + font-style: normal; + +} + +[class^="ion-"]:before, +[class*=" ion-"]:before, .ion-inside { + display: inline-block; + font-family: "ionicons" !important; + speak: none; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + text-rendering: auto; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.ion-android-add:before { + content: "\f2c7"; +} + +.ion-chevron-left:before { + content: "\f124"; +} + +.ion-chevron-right:before { + content: "\f125"; +} + +.ion-pin:before { + content: "\f3a3"; +} + +.ion-wifi:before { + content: "\f25c"; +} + +.ion-eye:before { + content: "\f133"; +} + +.ion-ios-arrow-thin-left:before { + content: "\f3d5"; +} + +.ion-ios-arrow-thin-right:before { + content: "\f3d6"; +} + +.ion-arrow-up-b:before { + content: "\f10d"; +} + +.ion-arrow-down-b:before { + content: "\f104"; +} + +.ion-android-locate:before { + content: "\f2e9"; +} + +.ion-android-close:before { + content: "\f2d7"; +} + +.ion-android-lock:before { + content: "\f392"; +} + +.ion-ios-copy:before { + content: "\f41c"; +} + +.ion-location:before { + content: "\f456"; +} + +.ion-android-remove:before { + content: "\f2f4"; +} + +.ion-ios-person:before { + content: "\f47e"; +} diff --git a/bower.json b/bower.json index be1795a..e8d473a 100644 --- a/bower.json +++ b/bower.json @@ -11,7 +11,6 @@ "Leaflet.label": "~0.2.1", "chroma-js": "~0.6.1", "leaflet": "~0.7.3", - "ionicons": "~2.0.1", "moment": "~2.9.0", "requirejs": "~2.1.16", "tablesort": "https://github.com/tristen/tablesort.git#v3.0.2", diff --git a/html/index.html b/html/index.html index 676cc92..66b1f96 100644 --- a/html/index.html +++ b/html/index.html @@ -3,7 +3,7 @@ - + diff --git a/index.html b/index.html index 0644f3c..66ab618 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ - + diff --git a/lib/map.js b/lib/map.js index 0923d89..d160dcd 100644 --- a/lib/map.js +++ b/lib/map.js @@ -86,7 +86,7 @@ define(["map/clientlayer", "map/labelslayer", onAdd: function () { var button = L.DomUtil.create("button", "coord-picker"); - button.textContent = "\uF2A6"; + button.textContent = "\uF3A3"; // Click propagation isn't disabled as this causes problems with the // location picking mode; instead propagation is stopped in onClick(). diff --git a/tasks/build.js b/tasks/build.js index 497da6d..d163aae 100644 --- a/tasks/build.js +++ b/tasks/build.js @@ -42,11 +42,11 @@ module.exports = function (grunt) { }, ionicons: { src: ["fonts/*", - "css/ionicons.min.css" + "hopglass-icons.css" ], expand: true, dest: "build/", - cwd: "bower_components/ionicons/" + cwd: "assets/icons/" }, leafletImages: { src: ["images/*"],