From b0864810a4aeb2e56430dff62f6a7323660c4558 Mon Sep 17 00:00:00 2001
From: Kazhnuz <kazhnuz@chlore.net>
Date: Sat, 16 May 2020 17:54:24 +0200
Subject: [PATCH] improvement: better theming

---
 src/blog/themes/blog/_config.yml                       | 7 +++----
 src/blog/themes/blog/layout/_partial/head.ejs          | 2 ++
 src/blog/themes/blog/layout/_widget/archive.ejs        | 4 ++--
 src/blog/themes/blog/layout/_widget/category.ejs       | 4 ++--
 src/blog/themes/blog/layout/_widget/recent_posts.ejs   | 4 ++--
 src/blog/themes/blog/layout/_widget/tag.ejs            | 4 ++--
 src/blog/themes/blog/layout/_widget/tagcloud.ejs       | 2 +-
 src/scss/_typography.scss                              | 1 +
 src/scss/components/_cards.scss                        | 3 +++
 src/textes/themes/blog/_config.yml                     | 7 +++----
 src/textes/themes/blog/layout/_partial/article.ejs     | 4 ++--
 src/textes/themes/blog/layout/_partial/head.ejs        | 2 ++
 src/textes/themes/blog/layout/_widget/archive.ejs      | 4 ++--
 src/textes/themes/blog/layout/_widget/category.ejs     | 4 ++--
 src/textes/themes/blog/layout/_widget/recent_posts.ejs | 4 ++--
 src/textes/themes/blog/layout/_widget/tag.ejs          | 4 ++--
 src/textes/themes/blog/layout/_widget/tagcloud.ejs     | 2 +-
 17 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/src/blog/themes/blog/_config.yml b/src/blog/themes/blog/_config.yml
index d1b9e1e..7a677b1 100644
--- a/src/blog/themes/blog/_config.yml
+++ b/src/blog/themes/blog/_config.yml
@@ -11,11 +11,10 @@ fancybox: true
 # Sidebar
 sidebar: right
 widgets:
-- category
-- tag
-- tagcloud
-- archive
 - recent_posts
+- category
+- archive
+- tag
 
 # display widgets at the bottom of index pages (pagination == 2)
 index_widgets:
diff --git a/src/blog/themes/blog/layout/_partial/head.ejs b/src/blog/themes/blog/layout/_partial/head.ejs
index a4cdfcc..e9a146f 100644
--- a/src/blog/themes/blog/layout/_partial/head.ejs
+++ b/src/blog/themes/blog/layout/_partial/head.ejs
@@ -31,6 +31,8 @@
   <% if (config.highlight.enable){ %>
     <link href="//fonts.googleapis.com/css?family=Source+Code+Pro" rel="stylesheet" type="text/css">
   <% } %>
+  <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,800&display=swap" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/css?family=Amatic+SC&display=swap" rel="stylesheet">
   <link href="/dep/spectre/css/spectre.min.css" rel="stylesheet">
   <link href="/dep/fork-awesome/css/fork-awesome.css" rel="stylesheet">
 
diff --git a/src/blog/themes/blog/layout/_widget/archive.ejs b/src/blog/themes/blog/layout/_widget/archive.ejs
index 33a4daf..c3dbf13 100644
--- a/src/blog/themes/blog/layout/_widget/archive.ejs
+++ b/src/blog/themes/blog/layout/_widget/archive.ejs
@@ -1,6 +1,6 @@
 <% if (site.posts.length){ %>
-  <div class="card card-info">
-    <div class="card-header"><%= __('archive_a') %></div>
+  <div class="card card-primary">
+    <div class="card-header"><i class="fa fa-calendar-o"></i><%= __('archive_a') %></div>
     <div class="card-menu">
       <%- list_archives({show_count: theme.show_count,
         type: theme.archive_type, style:"list", class:"menu-element"}) %>
diff --git a/src/blog/themes/blog/layout/_widget/category.ejs b/src/blog/themes/blog/layout/_widget/category.ejs
index 945ad81..b5cd134 100644
--- a/src/blog/themes/blog/layout/_widget/category.ejs
+++ b/src/blog/themes/blog/layout/_widget/category.ejs
@@ -1,6 +1,6 @@
 <% if (site.categories.length){ %>
-  <div class="card card-info">
-    <div class="card-header"><%= __('categories') %></div>
+  <div class="card card-primary">
+    <div class="card-header"><i class="fa fa-folder"></i><%= __('categories') %></div>
     <div class="card-menu">
       <%- list_categories({show_count: theme.show_count}) %>
     </div>
diff --git a/src/blog/themes/blog/layout/_widget/recent_posts.ejs b/src/blog/themes/blog/layout/_widget/recent_posts.ejs
index 81bb58f..fc5067f 100644
--- a/src/blog/themes/blog/layout/_widget/recent_posts.ejs
+++ b/src/blog/themes/blog/layout/_widget/recent_posts.ejs
@@ -1,6 +1,6 @@
 <% if (site.posts.length){ %>
-  <div class="card card-info">
-    <div class="card-header"><%= __('recent_posts') %></div>
+  <div class="card card-primary">
+    <div class="card-header"><i class="fa fa-rss"></i><%= __('recent_posts') %></div>
     <div class="card-menu">
         <% site.posts.sort('date', -1).limit(5).each(function(post){ %>
             <a class="menu-element" href="<%- url_for(post.path) %>">
diff --git a/src/blog/themes/blog/layout/_widget/tag.ejs b/src/blog/themes/blog/layout/_widget/tag.ejs
index 9f4e05d..1bec225 100644
--- a/src/blog/themes/blog/layout/_widget/tag.ejs
+++ b/src/blog/themes/blog/layout/_widget/tag.ejs
@@ -1,6 +1,6 @@
 <% if (site.tags.length){ %>
-  <div class="card card-info">
-    <h3 class="card-header"><%= __('tags') %></h3>
+  <div class="card card-primary">
+    <h3 class="card-header"><i class="fa fa-tags"></i><%= __('tags') %></h3>
     <div class="card-menu">
       <%- list_tags({show_count: theme.show_count}) %>
     </div>
diff --git a/src/blog/themes/blog/layout/_widget/tagcloud.ejs b/src/blog/themes/blog/layout/_widget/tagcloud.ejs
index f26b99a..b9f4eb1 100644
--- a/src/blog/themes/blog/layout/_widget/tagcloud.ejs
+++ b/src/blog/themes/blog/layout/_widget/tagcloud.ejs
@@ -1,5 +1,5 @@
 <% if (site.tags.length){ %>
-  <div class="card card-info">
+  <div class="card card-primary">
     <h3 class="card-header"><%= __('tagcloud') %></h3>
     <div class="card-body tagcloud">
       <%- tagcloud() %>
diff --git a/src/scss/_typography.scss b/src/scss/_typography.scss
index 13f4a6f..1a898e2 100644
--- a/src/scss/_typography.scss
+++ b/src/scss/_typography.scss
@@ -235,6 +235,7 @@ code {
 .container-typographic {
   max-width: 800px;
   margin:auto;
+  margin-bottom: 3rem;
 }
 
 
diff --git a/src/scss/components/_cards.scss b/src/scss/components/_cards.scss
index db5c892..6058e07 100644
--- a/src/scss/components/_cards.scss
+++ b/src/scss/components/_cards.scss
@@ -66,6 +66,9 @@ $card-smallpad: $lineheight_half;
 
     &-header {
         @include card-header($card-bigpad);
+        .fa {
+          margin-right: 0.5em;
+        }
     }
 
     /* Menu handling */
diff --git a/src/textes/themes/blog/_config.yml b/src/textes/themes/blog/_config.yml
index d1b9e1e..7a677b1 100644
--- a/src/textes/themes/blog/_config.yml
+++ b/src/textes/themes/blog/_config.yml
@@ -11,11 +11,10 @@ fancybox: true
 # Sidebar
 sidebar: right
 widgets:
-- category
-- tag
-- tagcloud
-- archive
 - recent_posts
+- category
+- archive
+- tag
 
 # display widgets at the bottom of index pages (pagination == 2)
 index_widgets:
diff --git a/src/textes/themes/blog/layout/_partial/article.ejs b/src/textes/themes/blog/layout/_partial/article.ejs
index d35f95c..b4a88f6 100644
--- a/src/textes/themes/blog/layout/_partial/article.ejs
+++ b/src/textes/themes/blog/layout/_partial/article.ejs
@@ -2,9 +2,9 @@
   <div class="article-inner">
     <%- partial('post/gallery') %>
     <% if (post.link || post.title){ %>
-      <header class="article-header">
+      <div class="article-header">
         <%- partial('post/title', {class_name: 'article-title'}) %>
-      </header>
+      </div>
     <% } %>
     <div class="article-entry" itemprop="articleBody">
       <% if (post.excerpt && index){ %>
diff --git a/src/textes/themes/blog/layout/_partial/head.ejs b/src/textes/themes/blog/layout/_partial/head.ejs
index a4cdfcc..e9a146f 100644
--- a/src/textes/themes/blog/layout/_partial/head.ejs
+++ b/src/textes/themes/blog/layout/_partial/head.ejs
@@ -31,6 +31,8 @@
   <% if (config.highlight.enable){ %>
     <link href="//fonts.googleapis.com/css?family=Source+Code+Pro" rel="stylesheet" type="text/css">
   <% } %>
+  <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,800&display=swap" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/css?family=Amatic+SC&display=swap" rel="stylesheet">
   <link href="/dep/spectre/css/spectre.min.css" rel="stylesheet">
   <link href="/dep/fork-awesome/css/fork-awesome.css" rel="stylesheet">
 
diff --git a/src/textes/themes/blog/layout/_widget/archive.ejs b/src/textes/themes/blog/layout/_widget/archive.ejs
index 33a4daf..c3dbf13 100644
--- a/src/textes/themes/blog/layout/_widget/archive.ejs
+++ b/src/textes/themes/blog/layout/_widget/archive.ejs
@@ -1,6 +1,6 @@
 <% if (site.posts.length){ %>
-  <div class="card card-info">
-    <div class="card-header"><%= __('archive_a') %></div>
+  <div class="card card-primary">
+    <div class="card-header"><i class="fa fa-calendar-o"></i><%= __('archive_a') %></div>
     <div class="card-menu">
       <%- list_archives({show_count: theme.show_count,
         type: theme.archive_type, style:"list", class:"menu-element"}) %>
diff --git a/src/textes/themes/blog/layout/_widget/category.ejs b/src/textes/themes/blog/layout/_widget/category.ejs
index 945ad81..b5cd134 100644
--- a/src/textes/themes/blog/layout/_widget/category.ejs
+++ b/src/textes/themes/blog/layout/_widget/category.ejs
@@ -1,6 +1,6 @@
 <% if (site.categories.length){ %>
-  <div class="card card-info">
-    <div class="card-header"><%= __('categories') %></div>
+  <div class="card card-primary">
+    <div class="card-header"><i class="fa fa-folder"></i><%= __('categories') %></div>
     <div class="card-menu">
       <%- list_categories({show_count: theme.show_count}) %>
     </div>
diff --git a/src/textes/themes/blog/layout/_widget/recent_posts.ejs b/src/textes/themes/blog/layout/_widget/recent_posts.ejs
index 81bb58f..fc5067f 100644
--- a/src/textes/themes/blog/layout/_widget/recent_posts.ejs
+++ b/src/textes/themes/blog/layout/_widget/recent_posts.ejs
@@ -1,6 +1,6 @@
 <% if (site.posts.length){ %>
-  <div class="card card-info">
-    <div class="card-header"><%= __('recent_posts') %></div>
+  <div class="card card-primary">
+    <div class="card-header"><i class="fa fa-rss"></i><%= __('recent_posts') %></div>
     <div class="card-menu">
         <% site.posts.sort('date', -1).limit(5).each(function(post){ %>
             <a class="menu-element" href="<%- url_for(post.path) %>">
diff --git a/src/textes/themes/blog/layout/_widget/tag.ejs b/src/textes/themes/blog/layout/_widget/tag.ejs
index 9f4e05d..1bec225 100644
--- a/src/textes/themes/blog/layout/_widget/tag.ejs
+++ b/src/textes/themes/blog/layout/_widget/tag.ejs
@@ -1,6 +1,6 @@
 <% if (site.tags.length){ %>
-  <div class="card card-info">
-    <h3 class="card-header"><%= __('tags') %></h3>
+  <div class="card card-primary">
+    <h3 class="card-header"><i class="fa fa-tags"></i><%= __('tags') %></h3>
     <div class="card-menu">
       <%- list_tags({show_count: theme.show_count}) %>
     </div>
diff --git a/src/textes/themes/blog/layout/_widget/tagcloud.ejs b/src/textes/themes/blog/layout/_widget/tagcloud.ejs
index f26b99a..b9f4eb1 100644
--- a/src/textes/themes/blog/layout/_widget/tagcloud.ejs
+++ b/src/textes/themes/blog/layout/_widget/tagcloud.ejs
@@ -1,5 +1,5 @@
 <% if (site.tags.length){ %>
-  <div class="card card-info">
+  <div class="card card-primary">
     <h3 class="card-header"><%= __('tagcloud') %></h3>
     <div class="card-body tagcloud">
       <%- tagcloud() %>