From 41c4ce6549b2fc7ffac9efb6f0c2ba40f890bdbc Mon Sep 17 00:00:00 2001
From: Derek Severin <severinderek@gmail.com>
Date: Mon, 25 Mar 2019 14:47:38 +0700
Subject: Modified fonts

---
 layouts/partials/head.html          | 3 ++-
 layouts/partials/pages/sidebar.html | 7 ++++---
 static/css/default.css              | 3 ++-
 static/css/theme.css                | 6 +++++-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index bbeaa35..c656489 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -25,8 +25,9 @@
 <link rel="stylesheet" href="{{ "plugins/bootstrap/css/bootstrap.min.css" | absURL }}" type="text/css">
 
 {{ "<!-- Custom Fonts -->" | safeHTML }}
-<link rel='stylesheet' href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' type='text/css'>
 <link rel='stylesheet' href='//fonts.googleapis.com/css?family=Merriweather:400,300,300italic,400italic,700,700italic,900,900italic' type='text/css'>
+<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Anton">
+<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Fjalla+One">
 <link rel="stylesheet" href="{{ "plugins/font-awesome/css/all.css" | absURL }}" type="text/css">
 
 {{ "<!-- CSS Plugins -->" | safeHTML }}
diff --git a/layouts/partials/pages/sidebar.html b/layouts/partials/pages/sidebar.html
index c02829f..f5a71e2 100644
--- a/layouts/partials/pages/sidebar.html
+++ b/layouts/partials/pages/sidebar.html
@@ -59,18 +59,19 @@
         {{ end }}
     </div>
 
+    <br>
     {{ "<!-- Categories -->" | safeHTML }}
     <div>
-        <h5>CATEGORIES</h5>
+        <div class="tag-title">CATEGORIES</div>
         <div class="tags">
             {{/* List categories without duplicates */}}
             {{ partial "utils/list-keywords.html" (dict "type" "categories" "context" . "scratch" .Scratch "removeDuplicates" true) }}
         </div>
     </div>
-
+    <br>
     {{ "<!-- Tags -->" | safeHTML }}
     <div>
-        <h5>TAGS</h5>
+        <div class="tag-title">TAGS</div>
         <div class="tags">
             {{/* List tags without duplicates */}}
             {{ partial "utils/list-keywords.html" (dict "type" "tags" "context" . "scratch" .Scratch "removeDuplicates" true) }}
diff --git a/static/css/default.css b/static/css/default.css
index 42c71f8..d3e4e35 100644
--- a/static/css/default.css
+++ b/static/css/default.css
@@ -1,7 +1,8 @@
 :root{
 
     --GENERAL-FONT-1: "Merriweather", "Helvetica Neue", Arial, sans-serif;
-    --GENERAL-FONT-2: "Open Sans", "Helvetica Neue", Arial, sans-serif;
+    --GENERAL-FONT-2: "Fjalla One", "Helvetica Neue", Arial, sans-serif;
+    --GENERAL-FONT-3: "Anton", "Helvetica Neue", Arial, sans-serif;
 
     --GENERAL-COLOR-1: rgb(64, 95, 240);
     --GENERAL-COLOR-2: white;
diff --git a/static/css/theme.css b/static/css/theme.css
index 964f6a5..6298768 100644
--- a/static/css/theme.css
+++ b/static/css/theme.css
@@ -394,6 +394,10 @@ ul.images-list {
 
 /* TAGS */
 
+.tag-title {
+    font-family: var(--SIDEBAR-LINK-FONT, var(--GENERAL-FONT-3));
+}
+
 .tags a {
     display: inline-block;
     border-radius: 999em;
@@ -1042,7 +1046,7 @@ min-height: 300px;
 }
 
 .sidebar-tree .parent-link {
-    font-family: var(--SIDEBAR-LINK-FONT, var(--GENERAL-FONT-1));
+    font-family: var(--SIDEBAR-LINK-FONT, var(--GENERAL-FONT-3));
 }
 
 .sidebar-tree li {
-- 
cgit v1.2.3