Instead of loading Roboto in the CSS, load it as a stylesheet link in…

… <HEAD> like we were with Lato, because apparently WAFs don't complain about that? (#12948) Also yank Lato and Montserrat since they were kind of pointless. Fixes #8179 (hopefully). Signed-off-by: Flynn <[email protected]>
linkerd · Aug 21, 2024 · 9afa410 · 9afa410
1 parent 332c4ef
commit 9afa410
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/web/app/css/styles.css b/web/app/css/styles.css
@@ -1,9 +1,6 @@
-/* material-ui uses Roboto */
-@import url("https://fonts.googleapis.com/css?family=Montserrat:400,700|Roboto:100,300,400|Roboto+Mono");
-
 :root {
   --linkblue: #2196f3;
-  --font-stack: 'Roboto', 'Lato', helvetica, arial, sans-serif;
+  --font-stack: 'Roboto', helvetica, arial, sans-serif;
 }
 
 body {

diff --git a/web/templates/includes/base.tmpl.html b/web/templates/includes/base.tmpl.html
@@ -8,7 +8,8 @@
     <meta name="description" content="Linkerd">
     <meta name="keywords" content="Linkerd">
     <link rel="icon" type="image/png" href="{{.Contents.PathPrefix}}dist/img/favicon.png">
-    <link href="https://fonts.googleapis.com/css?family=Lato:300,400,700,900" rel="stylesheet">
+    <!-- material-ui uses Roboto -->
+    <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400|Roboto+Mono" rel="stylesheet">
     {{ template "script-tags" . }}
   </head>
   <body>