From fa5ffdc07a1267620acb7308188132fb8f39833f Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Tue, 26 Mar 2019 21:27:55 +0100
Subject: [PATCH 1/2] Remove the external fonts usage

This is a radical (and simple) solution
to #853, #399, #439, #174 and partially #712.
---
 airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp          | 2 --
 .../src/main/webapp/style/default-without-mediaelement.css  | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp
index 9a417c83..3cd85e12 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp
@@ -12,8 +12,6 @@
 <!-- Included before airsonic stylesheet to allow overriding -->
 <link type="text/css" rel="stylesheet" href="<c:url value="/script/mediaelement/mediaelementplayer.min.css"/>">
 <link rel="stylesheet" href="<c:url value="/${styleSheet}"/>" type="text/css">
-<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Ubuntu&subset=latin,cyrillic-ext,greek-ext,greek,latin-ext,cyrillic" type="text/css"/>
-<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:400,300,400italic,500,300italic,500italic,700,700italic,100,100italic" type="text/css"/>
 <title>Airsonic</title>
 
 <!-- Import Mousetrap and enable shortcuts if necessary -->
diff --git a/airsonic-main/src/main/webapp/style/default-without-mediaelement.css b/airsonic-main/src/main/webapp/style/default-without-mediaelement.css
index 4c195be9..03f7b2b9 100644
--- a/airsonic-main/src/main/webapp/style/default-without-mediaelement.css
+++ b/airsonic-main/src/main/webapp/style/default-without-mediaelement.css
@@ -84,16 +84,16 @@ body {
 }
 
 body, form, label, table, a {
-    font-family: 'Roboto', arial, sans-serif;
+    font-family: arial, sans-serif;
 }
 
 h1, h1 a {
-    font-family: 'Ubuntu', arial, sans-serif;
+    font-family: arial, sans-serif;
     font-weight: normal;
 }
 
 h2, h2 a, .topHeader a {
-    font-family: 'Roboto', arial, sans-serif;
+    font-family: arial, sans-serif;
     font-weight: normal;
 }
 

From 39b9eab715f193d8c54605604c34965e01bb44a4 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Tue, 26 Mar 2019 23:08:50 +0100
Subject: [PATCH 2/2] Simplify a bit the css

---
 .../webapp/style/default-without-mediaelement.css  | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/airsonic-main/src/main/webapp/style/default-without-mediaelement.css b/airsonic-main/src/main/webapp/style/default-without-mediaelement.css
index 03f7b2b9..43292320 100644
--- a/airsonic-main/src/main/webapp/style/default-without-mediaelement.css
+++ b/airsonic-main/src/main/webapp/style/default-without-mediaelement.css
@@ -83,19 +83,6 @@ body {
     scrollbar-darkshadow-color: #98AAB1;
 }
 
-body, form, label, table, a {
-    font-family: arial, sans-serif;
-}
-
-h1, h1 a {
-    font-family: arial, sans-serif;
-    font-weight: normal;
-}
-
-h2, h2 a, .topHeader a {
-    font-family: arial, sans-serif;
-    font-weight: normal;
-}
 
 /* Login page */
 
@@ -156,6 +143,7 @@ body {
     padding:0;
     border:0;
     margin:0.75em;
+    font-family: Verdana, Tahoma, Geneva, arial, sans-serif;
     font-size: 10.5pt;
     line-height: 1.5em;
 }