diff --git a/umap/static/umap/font/FiraSans-Bold.eot b/umap/static/umap/font/FiraSans-Bold.eot
deleted file mode 100644
index 07323b60..00000000
Binary files a/umap/static/umap/font/FiraSans-Bold.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Bold.ttf b/umap/static/umap/font/FiraSans-Bold.ttf
deleted file mode 100644
index 093503b4..00000000
Binary files a/umap/static/umap/font/FiraSans-Bold.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Bold.woff b/umap/static/umap/font/FiraSans-Bold.woff
deleted file mode 100644
index ebc183ee..00000000
Binary files a/umap/static/umap/font/FiraSans-Bold.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-BoldItalic.eot b/umap/static/umap/font/FiraSans-BoldItalic.eot
deleted file mode 100644
index 1600c30c..00000000
Binary files a/umap/static/umap/font/FiraSans-BoldItalic.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-BoldItalic.ttf b/umap/static/umap/font/FiraSans-BoldItalic.ttf
deleted file mode 100644
index dd5120e3..00000000
Binary files a/umap/static/umap/font/FiraSans-BoldItalic.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-BoldItalic.woff b/umap/static/umap/font/FiraSans-BoldItalic.woff
deleted file mode 100644
index 51b9f839..00000000
Binary files a/umap/static/umap/font/FiraSans-BoldItalic.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Book.eot b/umap/static/umap/font/FiraSans-Book.eot
deleted file mode 100644
index ef80967e..00000000
Binary files a/umap/static/umap/font/FiraSans-Book.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Book.ttf b/umap/static/umap/font/FiraSans-Book.ttf
deleted file mode 100644
index 915e5499..00000000
Binary files a/umap/static/umap/font/FiraSans-Book.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Book.woff b/umap/static/umap/font/FiraSans-Book.woff
deleted file mode 100644
index 10e43776..00000000
Binary files a/umap/static/umap/font/FiraSans-Book.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-BookItalic.eot b/umap/static/umap/font/FiraSans-BookItalic.eot
deleted file mode 100644
index 49847530..00000000
Binary files a/umap/static/umap/font/FiraSans-BookItalic.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-BookItalic.ttf b/umap/static/umap/font/FiraSans-BookItalic.ttf
deleted file mode 100644
index bab6d34d..00000000
Binary files a/umap/static/umap/font/FiraSans-BookItalic.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-BookItalic.woff b/umap/static/umap/font/FiraSans-BookItalic.woff
deleted file mode 100644
index e215a55f..00000000
Binary files a/umap/static/umap/font/FiraSans-BookItalic.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Eight.eot b/umap/static/umap/font/FiraSans-Eight.eot
deleted file mode 100644
index ca28fb0e..00000000
Binary files a/umap/static/umap/font/FiraSans-Eight.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Eight.ttf b/umap/static/umap/font/FiraSans-Eight.ttf
deleted file mode 100644
index 4940d7de..00000000
Binary files a/umap/static/umap/font/FiraSans-Eight.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Eight.woff b/umap/static/umap/font/FiraSans-Eight.woff
deleted file mode 100644
index 5eb01b72..00000000
Binary files a/umap/static/umap/font/FiraSans-Eight.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-EightItalic.eot b/umap/static/umap/font/FiraSans-EightItalic.eot
deleted file mode 100644
index 38d93b21..00000000
Binary files a/umap/static/umap/font/FiraSans-EightItalic.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-EightItalic.ttf b/umap/static/umap/font/FiraSans-EightItalic.ttf
deleted file mode 100644
index 6e90509b..00000000
Binary files a/umap/static/umap/font/FiraSans-EightItalic.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-EightItalic.woff b/umap/static/umap/font/FiraSans-EightItalic.woff
deleted file mode 100644
index ab54cb30..00000000
Binary files a/umap/static/umap/font/FiraSans-EightItalic.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-ExtraBold.eot b/umap/static/umap/font/FiraSans-ExtraBold.eot
deleted file mode 100644
index a5f0ac8a..00000000
Binary files a/umap/static/umap/font/FiraSans-ExtraBold.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-ExtraBold.ttf b/umap/static/umap/font/FiraSans-ExtraBold.ttf
deleted file mode 100644
index d29854bc..00000000
Binary files a/umap/static/umap/font/FiraSans-ExtraBold.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-ExtraBold.woff b/umap/static/umap/font/FiraSans-ExtraBold.woff
deleted file mode 100644
index 5d98d85c..00000000
Binary files a/umap/static/umap/font/FiraSans-ExtraBold.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-ExtraBoldItalic.eot b/umap/static/umap/font/FiraSans-ExtraBoldItalic.eot
deleted file mode 100644
index b3331278..00000000
Binary files a/umap/static/umap/font/FiraSans-ExtraBoldItalic.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-ExtraBoldItalic.ttf b/umap/static/umap/font/FiraSans-ExtraBoldItalic.ttf
deleted file mode 100644
index 0f6d3c00..00000000
Binary files a/umap/static/umap/font/FiraSans-ExtraBoldItalic.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-ExtraBoldItalic.woff b/umap/static/umap/font/FiraSans-ExtraBoldItalic.woff
deleted file mode 100644
index 1623d62c..00000000
Binary files a/umap/static/umap/font/FiraSans-ExtraBoldItalic.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-ExtraLight.eot b/umap/static/umap/font/FiraSans-ExtraLight.eot
deleted file mode 100644
index 6aca60bc..00000000
Binary files a/umap/static/umap/font/FiraSans-ExtraLight.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-ExtraLight.ttf b/umap/static/umap/font/FiraSans-ExtraLight.ttf
deleted file mode 100644
index 88e44dde..00000000
Binary files a/umap/static/umap/font/FiraSans-ExtraLight.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-ExtraLight.woff b/umap/static/umap/font/FiraSans-ExtraLight.woff
deleted file mode 100644
index 90e5fdf7..00000000
Binary files a/umap/static/umap/font/FiraSans-ExtraLight.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-ExtraLightItalic.eot b/umap/static/umap/font/FiraSans-ExtraLightItalic.eot
deleted file mode 100644
index e0022004..00000000
Binary files a/umap/static/umap/font/FiraSans-ExtraLightItalic.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-ExtraLightItalic.ttf b/umap/static/umap/font/FiraSans-ExtraLightItalic.ttf
deleted file mode 100644
index 531723e6..00000000
Binary files a/umap/static/umap/font/FiraSans-ExtraLightItalic.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-ExtraLightItalic.woff b/umap/static/umap/font/FiraSans-ExtraLightItalic.woff
deleted file mode 100644
index 8fb2b01b..00000000
Binary files a/umap/static/umap/font/FiraSans-ExtraLightItalic.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Four.eot b/umap/static/umap/font/FiraSans-Four.eot
deleted file mode 100644
index d27db4e3..00000000
Binary files a/umap/static/umap/font/FiraSans-Four.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Four.ttf b/umap/static/umap/font/FiraSans-Four.ttf
deleted file mode 100644
index 958174ad..00000000
Binary files a/umap/static/umap/font/FiraSans-Four.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Four.woff b/umap/static/umap/font/FiraSans-Four.woff
deleted file mode 100644
index 782a04a7..00000000
Binary files a/umap/static/umap/font/FiraSans-Four.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-FourItalic.eot b/umap/static/umap/font/FiraSans-FourItalic.eot
deleted file mode 100644
index e3d484b2..00000000
Binary files a/umap/static/umap/font/FiraSans-FourItalic.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-FourItalic.ttf b/umap/static/umap/font/FiraSans-FourItalic.ttf
deleted file mode 100644
index 3f556598..00000000
Binary files a/umap/static/umap/font/FiraSans-FourItalic.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-FourItalic.woff b/umap/static/umap/font/FiraSans-FourItalic.woff
deleted file mode 100644
index 86bd358d..00000000
Binary files a/umap/static/umap/font/FiraSans-FourItalic.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Hair.eot b/umap/static/umap/font/FiraSans-Hair.eot
deleted file mode 100644
index c7050f54..00000000
Binary files a/umap/static/umap/font/FiraSans-Hair.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Hair.ttf b/umap/static/umap/font/FiraSans-Hair.ttf
deleted file mode 100644
index 5c322877..00000000
Binary files a/umap/static/umap/font/FiraSans-Hair.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Hair.woff b/umap/static/umap/font/FiraSans-Hair.woff
deleted file mode 100644
index 30de31f1..00000000
Binary files a/umap/static/umap/font/FiraSans-Hair.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-HairItalic.eot b/umap/static/umap/font/FiraSans-HairItalic.eot
deleted file mode 100644
index 5957c8e6..00000000
Binary files a/umap/static/umap/font/FiraSans-HairItalic.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-HairItalic.ttf b/umap/static/umap/font/FiraSans-HairItalic.ttf
deleted file mode 100644
index f604ab94..00000000
Binary files a/umap/static/umap/font/FiraSans-HairItalic.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-HairItalic.woff b/umap/static/umap/font/FiraSans-HairItalic.woff
deleted file mode 100644
index 22a380cc..00000000
Binary files a/umap/static/umap/font/FiraSans-HairItalic.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Heavy.eot b/umap/static/umap/font/FiraSans-Heavy.eot
deleted file mode 100644
index f5378e41..00000000
Binary files a/umap/static/umap/font/FiraSans-Heavy.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Heavy.ttf b/umap/static/umap/font/FiraSans-Heavy.ttf
deleted file mode 100644
index 6afcaf5c..00000000
Binary files a/umap/static/umap/font/FiraSans-Heavy.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Heavy.woff b/umap/static/umap/font/FiraSans-Heavy.woff
deleted file mode 100644
index 44015766..00000000
Binary files a/umap/static/umap/font/FiraSans-Heavy.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-HeavyItalic.eot b/umap/static/umap/font/FiraSans-HeavyItalic.eot
deleted file mode 100644
index b613e190..00000000
Binary files a/umap/static/umap/font/FiraSans-HeavyItalic.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-HeavyItalic.ttf b/umap/static/umap/font/FiraSans-HeavyItalic.ttf
deleted file mode 100644
index a24848d2..00000000
Binary files a/umap/static/umap/font/FiraSans-HeavyItalic.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-HeavyItalic.woff b/umap/static/umap/font/FiraSans-HeavyItalic.woff
deleted file mode 100644
index bd827a09..00000000
Binary files a/umap/static/umap/font/FiraSans-HeavyItalic.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Italic.eot b/umap/static/umap/font/FiraSans-Italic.eot
deleted file mode 100644
index 1369626e..00000000
Binary files a/umap/static/umap/font/FiraSans-Italic.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Italic.ttf b/umap/static/umap/font/FiraSans-Italic.ttf
deleted file mode 100644
index f627c34f..00000000
Binary files a/umap/static/umap/font/FiraSans-Italic.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Italic.woff b/umap/static/umap/font/FiraSans-Italic.woff
deleted file mode 100644
index e27b7f3b..00000000
Binary files a/umap/static/umap/font/FiraSans-Italic.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Light.eot b/umap/static/umap/font/FiraSans-Light.eot
deleted file mode 100644
index 4b8c121e..00000000
Binary files a/umap/static/umap/font/FiraSans-Light.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Light.ttf b/umap/static/umap/font/FiraSans-Light.ttf
deleted file mode 100644
index a6cae2f8..00000000
Binary files a/umap/static/umap/font/FiraSans-Light.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Light.woff b/umap/static/umap/font/FiraSans-Light.woff
old mode 100644
new mode 100755
index 59837354..747071e9
Binary files a/umap/static/umap/font/FiraSans-Light.woff and b/umap/static/umap/font/FiraSans-Light.woff differ
diff --git a/umap/static/umap/font/FiraSans-Light.woff2 b/umap/static/umap/font/FiraSans-Light.woff2
new file mode 100755
index 00000000..5c0e34d6
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Light.woff2 differ
diff --git a/umap/static/umap/font/FiraSans-LightItalic.eot b/umap/static/umap/font/FiraSans-LightItalic.eot
deleted file mode 100644
index 6d8db86c..00000000
Binary files a/umap/static/umap/font/FiraSans-LightItalic.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-LightItalic.ttf b/umap/static/umap/font/FiraSans-LightItalic.ttf
deleted file mode 100644
index 02e2cb2b..00000000
Binary files a/umap/static/umap/font/FiraSans-LightItalic.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-LightItalic.woff b/umap/static/umap/font/FiraSans-LightItalic.woff
old mode 100644
new mode 100755
index 78047e8c..e19720ac
Binary files a/umap/static/umap/font/FiraSans-LightItalic.woff and b/umap/static/umap/font/FiraSans-LightItalic.woff differ
diff --git a/umap/static/umap/font/FiraSans-LightItalic.woff2 b/umap/static/umap/font/FiraSans-LightItalic.woff2
new file mode 100755
index 00000000..0e9b453e
Binary files /dev/null and b/umap/static/umap/font/FiraSans-LightItalic.woff2 differ
diff --git a/umap/static/umap/font/FiraSans-Medium.eot b/umap/static/umap/font/FiraSans-Medium.eot
deleted file mode 100644
index 0261dc84..00000000
Binary files a/umap/static/umap/font/FiraSans-Medium.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Medium.ttf b/umap/static/umap/font/FiraSans-Medium.ttf
deleted file mode 100644
index 246c77fa..00000000
Binary files a/umap/static/umap/font/FiraSans-Medium.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Medium.woff b/umap/static/umap/font/FiraSans-Medium.woff
deleted file mode 100644
index 6b4cdb36..00000000
Binary files a/umap/static/umap/font/FiraSans-Medium.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-MediumItalic.eot b/umap/static/umap/font/FiraSans-MediumItalic.eot
deleted file mode 100644
index 0bf02d98..00000000
Binary files a/umap/static/umap/font/FiraSans-MediumItalic.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-MediumItalic.ttf b/umap/static/umap/font/FiraSans-MediumItalic.ttf
deleted file mode 100644
index cc5a5972..00000000
Binary files a/umap/static/umap/font/FiraSans-MediumItalic.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-MediumItalic.woff b/umap/static/umap/font/FiraSans-MediumItalic.woff
deleted file mode 100644
index e1bc9bde..00000000
Binary files a/umap/static/umap/font/FiraSans-MediumItalic.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Regular.eot b/umap/static/umap/font/FiraSans-Regular.eot
deleted file mode 100644
index ab82a339..00000000
Binary files a/umap/static/umap/font/FiraSans-Regular.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Regular.ttf b/umap/static/umap/font/FiraSans-Regular.ttf
deleted file mode 100644
index 76620091..00000000
Binary files a/umap/static/umap/font/FiraSans-Regular.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Regular.woff b/umap/static/umap/font/FiraSans-Regular.woff
deleted file mode 100644
index 0a82f0a1..00000000
Binary files a/umap/static/umap/font/FiraSans-Regular.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-SemiBold.eot b/umap/static/umap/font/FiraSans-SemiBold.eot
deleted file mode 100644
index 6efd64c4..00000000
Binary files a/umap/static/umap/font/FiraSans-SemiBold.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-SemiBold.ttf b/umap/static/umap/font/FiraSans-SemiBold.ttf
deleted file mode 100644
index b5208221..00000000
Binary files a/umap/static/umap/font/FiraSans-SemiBold.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-SemiBold.woff b/umap/static/umap/font/FiraSans-SemiBold.woff
old mode 100644
new mode 100755
index 157cd1f1..8b408d4d
Binary files a/umap/static/umap/font/FiraSans-SemiBold.woff and b/umap/static/umap/font/FiraSans-SemiBold.woff differ
diff --git a/umap/static/umap/font/FiraSans-SemiBold.woff2 b/umap/static/umap/font/FiraSans-SemiBold.woff2
new file mode 100755
index 00000000..bafabb5a
Binary files /dev/null and b/umap/static/umap/font/FiraSans-SemiBold.woff2 differ
diff --git a/umap/static/umap/font/FiraSans-SemiBoldItalic.eot b/umap/static/umap/font/FiraSans-SemiBoldItalic.eot
deleted file mode 100644
index 7959b7db..00000000
Binary files a/umap/static/umap/font/FiraSans-SemiBoldItalic.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-SemiBoldItalic.ttf b/umap/static/umap/font/FiraSans-SemiBoldItalic.ttf
deleted file mode 100644
index 0ee25639..00000000
Binary files a/umap/static/umap/font/FiraSans-SemiBoldItalic.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-SemiBoldItalic.woff b/umap/static/umap/font/FiraSans-SemiBoldItalic.woff
deleted file mode 100644
index 1cfcd374..00000000
Binary files a/umap/static/umap/font/FiraSans-SemiBoldItalic.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Thin.eot b/umap/static/umap/font/FiraSans-Thin.eot
deleted file mode 100644
index 96cf959b..00000000
Binary files a/umap/static/umap/font/FiraSans-Thin.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Thin.ttf b/umap/static/umap/font/FiraSans-Thin.ttf
deleted file mode 100644
index 805f1679..00000000
Binary files a/umap/static/umap/font/FiraSans-Thin.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Thin.woff b/umap/static/umap/font/FiraSans-Thin.woff
deleted file mode 100644
index 2181e96b..00000000
Binary files a/umap/static/umap/font/FiraSans-Thin.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-ThinItalic.eot b/umap/static/umap/font/FiraSans-ThinItalic.eot
deleted file mode 100644
index bef98b1f..00000000
Binary files a/umap/static/umap/font/FiraSans-ThinItalic.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-ThinItalic.ttf b/umap/static/umap/font/FiraSans-ThinItalic.ttf
deleted file mode 100644
index 7ad7a7dd..00000000
Binary files a/umap/static/umap/font/FiraSans-ThinItalic.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-ThinItalic.woff b/umap/static/umap/font/FiraSans-ThinItalic.woff
deleted file mode 100644
index 8e19b353..00000000
Binary files a/umap/static/umap/font/FiraSans-ThinItalic.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Two.eot b/umap/static/umap/font/FiraSans-Two.eot
deleted file mode 100644
index 58feef34..00000000
Binary files a/umap/static/umap/font/FiraSans-Two.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Two.ttf b/umap/static/umap/font/FiraSans-Two.ttf
deleted file mode 100644
index 7aaa9fef..00000000
Binary files a/umap/static/umap/font/FiraSans-Two.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Two.woff b/umap/static/umap/font/FiraSans-Two.woff
deleted file mode 100644
index bbda3720..00000000
Binary files a/umap/static/umap/font/FiraSans-Two.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-TwoItalic.eot b/umap/static/umap/font/FiraSans-TwoItalic.eot
deleted file mode 100644
index 4b4688d1..00000000
Binary files a/umap/static/umap/font/FiraSans-TwoItalic.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-TwoItalic.ttf b/umap/static/umap/font/FiraSans-TwoItalic.ttf
deleted file mode 100644
index 07b26bc7..00000000
Binary files a/umap/static/umap/font/FiraSans-TwoItalic.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-TwoItalic.woff b/umap/static/umap/font/FiraSans-TwoItalic.woff
deleted file mode 100644
index 97aa0ec6..00000000
Binary files a/umap/static/umap/font/FiraSans-TwoItalic.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Ultra.eot b/umap/static/umap/font/FiraSans-Ultra.eot
deleted file mode 100644
index 0fb4127a..00000000
Binary files a/umap/static/umap/font/FiraSans-Ultra.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Ultra.ttf b/umap/static/umap/font/FiraSans-Ultra.ttf
deleted file mode 100644
index 920f91dc..00000000
Binary files a/umap/static/umap/font/FiraSans-Ultra.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Ultra.woff b/umap/static/umap/font/FiraSans-Ultra.woff
deleted file mode 100644
index fb0a1a30..00000000
Binary files a/umap/static/umap/font/FiraSans-Ultra.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-UltraItalic.eot b/umap/static/umap/font/FiraSans-UltraItalic.eot
deleted file mode 100644
index 4699d2af..00000000
Binary files a/umap/static/umap/font/FiraSans-UltraItalic.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-UltraItalic.ttf b/umap/static/umap/font/FiraSans-UltraItalic.ttf
deleted file mode 100644
index b230ea10..00000000
Binary files a/umap/static/umap/font/FiraSans-UltraItalic.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-UltraItalic.woff b/umap/static/umap/font/FiraSans-UltraItalic.woff
deleted file mode 100644
index ba234d26..00000000
Binary files a/umap/static/umap/font/FiraSans-UltraItalic.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-UltraLight.eot b/umap/static/umap/font/FiraSans-UltraLight.eot
deleted file mode 100644
index 1dcb2a9c..00000000
Binary files a/umap/static/umap/font/FiraSans-UltraLight.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-UltraLight.ttf b/umap/static/umap/font/FiraSans-UltraLight.ttf
deleted file mode 100644
index 20fe9e0c..00000000
Binary files a/umap/static/umap/font/FiraSans-UltraLight.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-UltraLight.woff b/umap/static/umap/font/FiraSans-UltraLight.woff
deleted file mode 100644
index 1499c058..00000000
Binary files a/umap/static/umap/font/FiraSans-UltraLight.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-UltraLightItalic.eot b/umap/static/umap/font/FiraSans-UltraLightItalic.eot
deleted file mode 100644
index faf786a5..00000000
Binary files a/umap/static/umap/font/FiraSans-UltraLightItalic.eot and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-UltraLightItalic.ttf b/umap/static/umap/font/FiraSans-UltraLightItalic.ttf
deleted file mode 100644
index 4a6274ea..00000000
Binary files a/umap/static/umap/font/FiraSans-UltraLightItalic.ttf and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-UltraLightItalic.woff b/umap/static/umap/font/FiraSans-UltraLightItalic.woff
deleted file mode 100644
index 04b0b116..00000000
Binary files a/umap/static/umap/font/FiraSans-UltraLightItalic.woff and /dev/null differ
diff --git a/umap/static/umap/font/pts55f-webfont.eot b/umap/static/umap/font/pts55f-webfont.eot
deleted file mode 100644
index 7062749a..00000000
Binary files a/umap/static/umap/font/pts55f-webfont.eot and /dev/null differ
diff --git a/umap/static/umap/font/pts55f-webfont.svg b/umap/static/umap/font/pts55f-webfont.svg
deleted file mode 100644
index 1a5d6cae..00000000
--- a/umap/static/umap/font/pts55f-webfont.svg
+++ /dev/null
@@ -1,678 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/umap/static/umap/font/pts55f-webfont.ttf b/umap/static/umap/font/pts55f-webfont.ttf
deleted file mode 100644
index 51216081..00000000
Binary files a/umap/static/umap/font/pts55f-webfont.ttf and /dev/null differ
diff --git a/umap/static/umap/font/pts55f-webfont.woff b/umap/static/umap/font/pts55f-webfont.woff
deleted file mode 100644
index 057991d3..00000000
Binary files a/umap/static/umap/font/pts55f-webfont.woff and /dev/null differ
diff --git a/umap/static/umap/font/pts56f-webfont.eot b/umap/static/umap/font/pts56f-webfont.eot
deleted file mode 100644
index af9e6d16..00000000
Binary files a/umap/static/umap/font/pts56f-webfont.eot and /dev/null differ
diff --git a/umap/static/umap/font/pts56f-webfont.svg b/umap/static/umap/font/pts56f-webfont.svg
deleted file mode 100644
index 49e718fc..00000000
--- a/umap/static/umap/font/pts56f-webfont.svg
+++ /dev/null
@@ -1,706 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/umap/static/umap/font/pts56f-webfont.ttf b/umap/static/umap/font/pts56f-webfont.ttf
deleted file mode 100644
index 3f39f0b1..00000000
Binary files a/umap/static/umap/font/pts56f-webfont.ttf and /dev/null differ
diff --git a/umap/static/umap/font/pts56f-webfont.woff b/umap/static/umap/font/pts56f-webfont.woff
deleted file mode 100644
index da0d5c79..00000000
Binary files a/umap/static/umap/font/pts56f-webfont.woff and /dev/null differ
diff --git a/umap/static/umap/font/pts75f-webfont.eot b/umap/static/umap/font/pts75f-webfont.eot
deleted file mode 100644
index bbba0cff..00000000
Binary files a/umap/static/umap/font/pts75f-webfont.eot and /dev/null differ
diff --git a/umap/static/umap/font/pts75f-webfont.svg b/umap/static/umap/font/pts75f-webfont.svg
deleted file mode 100644
index 8335a139..00000000
--- a/umap/static/umap/font/pts75f-webfont.svg
+++ /dev/null
@@ -1,879 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/umap/static/umap/font/pts75f-webfont.ttf b/umap/static/umap/font/pts75f-webfont.ttf
deleted file mode 100644
index 8f667668..00000000
Binary files a/umap/static/umap/font/pts75f-webfont.ttf and /dev/null differ
diff --git a/umap/static/umap/font/pts75f-webfont.woff b/umap/static/umap/font/pts75f-webfont.woff
deleted file mode 100644
index 39ca4faa..00000000
Binary files a/umap/static/umap/font/pts75f-webfont.woff and /dev/null differ
diff --git a/umap/static/umap/font/pts76f-webfont.eot b/umap/static/umap/font/pts76f-webfont.eot
deleted file mode 100644
index d52bc7a7..00000000
Binary files a/umap/static/umap/font/pts76f-webfont.eot and /dev/null differ
diff --git a/umap/static/umap/font/pts76f-webfont.svg b/umap/static/umap/font/pts76f-webfont.svg
deleted file mode 100644
index 6160650e..00000000
--- a/umap/static/umap/font/pts76f-webfont.svg
+++ /dev/null
@@ -1,763 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/umap/static/umap/font/pts76f-webfont.ttf b/umap/static/umap/font/pts76f-webfont.ttf
deleted file mode 100644
index 9eb86257..00000000
Binary files a/umap/static/umap/font/pts76f-webfont.ttf and /dev/null differ
diff --git a/umap/static/umap/font/pts76f-webfont.woff b/umap/static/umap/font/pts76f-webfont.woff
deleted file mode 100644
index ac3ba450..00000000
Binary files a/umap/static/umap/font/pts76f-webfont.woff and /dev/null differ
diff --git a/umap/static/umap/nav.css b/umap/static/umap/nav.css
index e14b955e..2cf21774 100644
--- a/umap/static/umap/nav.css
+++ b/umap/static/umap/nav.css
@@ -21,7 +21,6 @@
padding-left: 80px;
display: block;
font-size: 2.5rem;
- font-family: 'fira_sansbold';
}
.umap-nav ul {
text-align: center;
diff --git a/umap/static/umap/umap.css b/umap/static/umap/umap.css
index 1e8bf954..25332167 100644
--- a/umap/static/umap/umap.css
+++ b/umap/static/umap/umap.css
@@ -4,37 +4,29 @@
@font-face {
- font-family: 'fira_sansbold';
- src: url('./font/FiraSans-Bold.eot');
- src: url('./font/FiraSans-Bold.eot?#iefix') format('embedded-opentype'),
- url('./font/FiraSans-Bold.woff') format('woff'),
- url('./font/FiraSans-Bold.ttf') format('truetype');
- font-weight: normal;
- font-style: normal;
-
-}
-
-
-@font-face {
- font-family: 'fira_sansregular';
- src: url('./font/FiraSans-Regular.eot');
- src: url('./font/FiraSans-Regular.eot?#iefix') format('embedded-opentype'),
- url('./font/FiraSans-Regular.woff') format('woff'),
- url('./font/FiraSans-Regular.ttf') format('truetype');
+ font-family: 'fira_sans';
+ src: url('./font/FiraSans-Light.woff2') format('woff2'),
+ url('./font/FiraSans-Light.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
- font-family: 'fira_sanslight';
- src: url('./font/FiraSans-Light.eot');
- src: url('./font/FiraSans-Light.eot?#iefix') format('embedded-opentype'),
- url('./font/FiraSans-Light.woff') format('woff'),
- url('./font/FiraSans-Light.ttf') format('truetype');
- font-weight: normal;
+ font-family: 'fira_sans';
+ src: url('./font/FiraSans-SemiBold.woff2') format('woff2'),
+ url('./font/FiraSans-SemiBold.woff') format('woff');
+ font-weight: bold;
font-style: normal;
}
+@font-face {
+ font-family: 'fira_sans';
+ src: url('./font/FiraSans-LightItalic.woff2') format('woff2'),
+ url('./font/FiraSans-LightItalic.woff') format('woff');
+ font-weight: normal;
+ font-style: italic;
+}
+
/*
* Generic
@@ -46,7 +38,9 @@ hr, input, textarea {
-webkit-box-sizing:border-box;
box-sizing: border-box;
margin: 0;
- font-family: 'fira_sanslight', sans-serif;
+ font-family: "fira_sans", -apple-system, BlinkMacSystemFont,
+ "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell",
+ "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
}
body, div, ul, ol, li, a, section, nav,
h1, h2, h3, h4, h5, h6, label, hr {
@@ -71,10 +65,6 @@ hr {
border-style: solid;
border-width: 1px 0 0;
}
-h1, h2, h3, h4, h5 {
- font-family: 'fira_sansbold', sans-serif;
- font-weight: normal;
-}
h1, h2 {
margin-bottom: 28px;
}
@@ -86,10 +76,6 @@ p {
margin-top: 14px;
margin-bottom: 14px;
}
-strong {
- font-family: 'fira_sansbold';
- font-weight: normal;
-}
/*
* List
@@ -275,9 +261,8 @@ footer a.branding {
background-position: left center;
background-repeat: no-repeat;
background-size: 60px auto;
- font-family: 'fira_sansbold';
font-size: 30px;
- font-weight: normal;
+ font-weight: bold;
height: 140px;
padding-left: 70px;
color: #8F96A3;
@@ -303,15 +288,12 @@ footer a.branding {
}
.map_list .legend a {
color: #222;
- font-family: "fira_sansbold";
- font-style: normal;
- font-weight: normal;
+ font-weight: bold;
}
.map_list .legend em,
.map_list .legend em a {
color: #444;
- font-family: "fira_sanslight";
- font-style: normal;
+ font-weight: normal;
}
.map_list hr {
display: none;