frontend: use wikimedia font cdn instead of google fonts (closes #124)

slaporte · slaporte · commit 90c41233e12b · 2018-06-04T21:37:41.000-07:00
diff --git a/client/src/components/toolbar/toolbar.html b/client/src/components/toolbar/toolbar.html
@@ -3,7 +3,7 @@
   <div class="md-toolbar-tools">
     <md-button class="toolbar__title" ui-sref="main.dashboard">
       Montage
-      <span class="text-primary">{{ $ctrl.config.env.name }}</span>
+      <span class="text-primary">{{ $ctrl.config.env.name  == 'prod' ? '' : $ctrl.config.env.name }}</span>
     </md-button>
     <span flex></span>
 
diff --git a/client/src/style.scss b/client/src/style.scss
@@ -1,5 +1,5 @@
-@import url('https://fonts.googleapis.com/css?family=Lato:300,400,600,700&subset=latin-ext');
-@import url('https://fonts.googleapis.com/css?family=Merriweather&subset=cyrillic,cyrillic-ext,latin-ext');
+@import url('https://tools-static.wmflabs.org/fontcdn/css?family=Lato:300,400,600,700&subset=latin-ext');
+@import url('https://tools-static.wmflabs.org/fontcdn/css?family=Merriweather&subset=cyrillic,cyrillic-ext,latin-ext');
 
 @import 'styles/dialog';
 @import 'styles/general';
diff --git a/montage/templates/docs/base.html b/montage/templates/docs/base.html
@@ -5,7 +5,7 @@
     <link rel="stylesheet" href="/mdl/material.min.css">
     <link rel="stylesheet" href="/mdl/styles.css">
     <script src="/mdl/material.min.js"></script>
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:400,200,100">
+    <link rel="stylesheet" href="https://tools-static.wmflabs.org/fontcdn/css?family=Roboto:400,200,100">
   </head>
   <body class="mdl-montage mdl-color--grey-100 mdl-color-text--grey-700 mdl-base">
     <header class="mdl-layout__header mdl-layout__header--scroll">
diff --git a/montage/templates/report.html b/montage/templates/report.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <link href="https://fonts.googleapis.com/css?family=Roboto:300,400" rel="stylesheet">
+    <link href="https://tools-static.wmflabs.org/fontcdn/css?family=Roboto:300,400" rel="stylesheet">
     <style>
       body {
         margin: 0;
diff --git a/report.html b/report.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <link href="https://fonts.googleapis.com/css?family=Roboto:300,400" rel="stylesheet">
+    <link href="https://tools-static.wmflabs.org/fontcdn/css?family=Roboto:300,400" rel="stylesheet">
     <style>
       body {
         margin: 0;
