Fix shared.css file style missing

15 files changed, 10 insertions, 70 deletions

diff --git a/settings.py b/settings.py
index ee46733..4cd882b 100644
--- a/settings.py
+++ b/settings.py
@@ -202,8 +202,8 @@ For security reasons, enabling this is not recommended.''',
         'comment': '',
         'options': [
             (0, 'Browser default'),
-            (1, 'Arial'),
-            (2, 'Liberation Serif'),
+            (1, 'Liberation Serif'),
+            (2, 'Arial'),
             (3, 'Verdana'),
             (4, 'Tahoma'),
         ],
diff --git a/youtube/__init__.py b/youtube/__init__.py
index 3977464..9a5f66c 100644
--- a/youtube/__init__.py
+++ b/youtube/__init__.py
@@ -113,8 +113,8 @@ def error_page(e):
 
 font_choices = {
     0: 'initial',
-    1: 'arial, "liberation sans", sans-serif',
-    2: '"liberation serif", "times new roman", calibri, carlito, serif',
+    1: '"liberation serif", "times new roman", calibri, carlito, serif',
+    2: 'arial, "liberation sans", sans-serif',
     3: 'verdana, sans-serif',
     4: 'tahoma, sans-serif',
 }
diff --git a/youtube/static/channel.css b/youtube/static/channel.css
index ada086d..c8750da 100644
--- a/youtube/static/channel.css
+++ b/youtube/static/channel.css
@@ -1,9 +1,3 @@
-html {
-    font-family: "liberation serif", "times new roman", calibri, carlito, serif;
-    background: var(--background);
-    color: var(--text);
-}
-
 body {
     display: grid;
     grid-gap: 20px;
diff --git a/youtube/static/comments.css b/youtube/static/comments.css
index a812db9..e259fc2 100644
--- a/youtube/static/comments.css
+++ b/youtube/static/comments.css
@@ -1,9 +1,3 @@
-html {
-    font-family: "liberation serif", "times new roman", calibri, carlito, serif;
-    background: var(--background);
-    color: var(--text);
-}
-
 body {
     display: grid;
     grid-gap: 20px;
diff --git a/youtube/static/home.css b/youtube/static/home.css
index 64180ea..6c782f5 100644
--- a/youtube/static/home.css
+++ b/youtube/static/home.css
@@ -1,9 +1,3 @@
-html {
-    font-family: "liberation serif", "times new roman", calibri, carlito, serif;
-    background: var(--background);
-    color: var(--text);
-}
-
 body {
     display: grid;
     grid-gap: 20px;
diff --git a/youtube/static/license.css b/youtube/static/license.css
index e632179..f338a5a 100644
--- a/youtube/static/license.css
+++ b/youtube/static/license.css
@@ -1,9 +1,3 @@
-html {
-    font-family: "liberation serif", "times new roman", calibri, carlito, serif;
-    background: var(--background);
-    color: var(--text);
-}
-
 body {
     display: grid;
     grid-gap: 20px;
diff --git a/youtube/static/local_playlist.css b/youtube/static/local_playlist.css
index 33771f4..3b32f0b 100644
--- a/youtube/static/local_playlist.css
+++ b/youtube/static/local_playlist.css
@@ -1,9 +1,3 @@
-html {
-    font-family: "liberation serif", "times new roman", calibri, carlito, serif;
-    background: var(--background);
-    color: var(--text);
-}
-
 body {
     display: grid;
     grid-gap: 20px;
diff --git a/youtube/static/playlist.css b/youtube/static/playlist.css
index 8438ceb..4bde3b5 100644
--- a/youtube/static/playlist.css
+++ b/youtube/static/playlist.css
@@ -1,9 +1,3 @@
-html {
-    font-family: "liberation serif", "times new roman", calibri, carlito, serif;
-    background: var(--background);
-    color: var(--text);
-}
-
 body {
     display: grid;
     grid-gap: 20px;
diff --git a/youtube/static/search.css b/youtube/static/search.css
index ff1fbda..da622fa 100644
--- a/youtube/static/search.css
+++ b/youtube/static/search.css
@@ -1,9 +1,3 @@
-html {
-    font-family: "liberation serif", "times new roman", calibri, carlito, serif;
-    background: var(--background);
-    color: var(--text);
-}
-
 body {
     display: grid;
     grid-gap: 20px;
diff --git a/youtube/static/settings.css b/youtube/static/settings.css
index aa296ff..d28640a 100644
--- a/youtube/static/settings.css
+++ b/youtube/static/settings.css
@@ -1,9 +1,3 @@
-html {
-    font-family: "liberation serif", "times new roman", calibri, carlito, serif;
-    background: var(--background);
-    color: var(--text);
-}
-
 body {
     display: grid;
     grid-gap: 20px;
diff --git a/youtube/static/subscription.css b/youtube/static/subscription.css
index 2004bd6..c163d9e 100644
--- a/youtube/static/subscription.css
+++ b/youtube/static/subscription.css
@@ -1,9 +1,3 @@
-html {
-    font-family: "liberation serif", "times new roman", calibri, carlito, serif;
-    background: var(--background);
-    color: var(--text);
-}
-
 body {
     display: grid;
     grid-gap: 20px;
diff --git a/youtube/static/subscription_manager.css b/youtube/static/subscription_manager.css
index 7ddd90e..e8d4d4b 100644
--- a/youtube/static/subscription_manager.css
+++ b/youtube/static/subscription_manager.css
@@ -1,9 +1,3 @@
-html {
-    font-family: "liberation serif", "times new roman", calibri, carlito, serif;
-    background: var(--background);
-    color: var(--text);
-}
-
 body {
     display: grid;
     grid-gap: 20px;
diff --git a/youtube/static/watch.css b/youtube/static/watch.css
index b141b91..73eefdc 100644
--- a/youtube/static/watch.css
+++ b/youtube/static/watch.css
@@ -1,9 +1,3 @@
-html {
-    font-family: "liberation serif", "times new roman", calibri, carlito, serif;
-    background: var(--background);
-    color: var(--text);
-}
-
 body {
     display: grid;
     grid-gap: 20px;
diff --git a/youtube/templates/base.html b/youtube/templates/base.html
index 012151f..f78d1b0 100644
--- a/youtube/templates/base.html
+++ b/youtube/templates/base.html
@@ -9,6 +9,7 @@
         <link href="/youtube.com/static/favicon.ico" type="image/x-icon" rel="icon"/>
         <link href="/youtube.com/static/normalize.css" rel="stylesheet"/>
         <link href="{{ theme_path }}" rel="stylesheet"/>
+        <link href="/youtube.com/shared.css" rel="stylesheet">
         {% block style %}
             {{ style }}
         {% endblock %}
diff --git a/youtube/templates/shared.css b/youtube/templates/shared.css
new file mode 100644
index 0000000..8f12651
--- /dev/null
+++ b/youtube/templates/shared.css
@@ -0,0 +1,5 @@
+html {
+    font-family: {{ font_family }};
+    background: var(--background);
+    color: var(--text);
+}