Merge branch 'develop' into feature/document

# Conflicts:
#	assets/css/_core/_base.scss
#	resources/_gen/assets/scss/css/style.template.scss_40942e46c3aa444eabf479d066570690.content
#	resources/_gen/assets/scss/css/style.template.scss_40942e46c3aa444eabf479d066570690.json

5 files changed, 59 insertions, 23 deletions

diff --git a/assets/css/_core/_base.scss b/assets/css/_core/_base.scss
index 205b45f..d68daaa 100644
--- a/assets/css/_core/_base.scss
+++ b/assets/css/_core/_base.scss
@@ -1,6 +1,8 @@
 html {
   font-family: $global-font-family;
-  font-size: 16px;
+  font-size: $global-font-size;
+  font-weight: $global-font-weight;
+  line-height: $global-line-height;
   width:100%;
 }
 
@@ -27,8 +29,6 @@ html {
 }
 
 body {
-  font-weight: 300;
-  line-height: 1.5rem;
   background-color: $global-background-color;
   color: $global-font-color;
   overflow-wrap: break-word;
@@ -80,6 +80,10 @@ a {
   }
 }
 
+b, strong {
+  font-weight: bold;
+}
+
 #dynamic-to-top {
   display: none;
   overflow: hidden;
diff --git a/assets/css/_partial/_header.scss b/assets/css/_partial/_header.scss
index 097de6c..263d593 100644
--- a/assets/css/_partial/_header.scss
+++ b/assets/css/_partial/_header.scss
@@ -6,6 +6,32 @@ header {
   .dark-theme & {
     background-color: $header-background-color-dark;
   }
+
+  .header-title {
+    font-weight: bold;
+  }
+
+  .select-language {
+    font-weight: $global-font-weight;
+    border: none;
+    box-shadow: none;
+    background: transparent;
+    background-image: none;
+    -webkit-appearance: none;
+    color: $global-font-color;
+
+    .dark-theme & {
+      color: $global-font-color-dark;
+    }
+
+    &:focus {
+      outline: none;
+    }
+
+    &:hover {
+      cursor: pointer;
+    }
+  }
 }
 
 #header-desktop {
diff --git a/assets/css/_partial/_home/_summary.scss b/assets/css/_partial/_home/_summary.scss
index c96a019..aada46d 100644
--- a/assets/css/_partial/_home/_summary.scss
+++ b/assets/css/_partial/_home/_summary.scss
@@ -30,24 +30,6 @@
       font-size: 1.6rem;
     }
 
-    .post-meta {
-      a {
-        color: $global-font-secondary-color !important;
-
-        .dark-theme & {
-          color: $global-font-secondary-color-dark !important;
-        }
-
-        &:hover {
-          color: $global-link-hover-color !important;
-
-          .dark-theme & {
-            color: $global-link-hover-color-dark !important;
-          }
-        }
-      }
-    }
-
     .content {
       display: -moz-box;
       display: -webkit-box;
@@ -59,6 +41,11 @@
       overflow: hidden;
       text-overflow: ellipsis;
       overflow-wrap: break-word;
+      color: $global-font-secondary-color;
+
+      .dark-theme & {
+        color: $global-font-secondary-color-dark;
+      }
 
       h2,
       h3,
diff --git a/assets/css/_partial/_single/_footer.scss b/assets/css/_partial/_single/_footer.scss
index e1beea9..8cf44b2 100644
--- a/assets/css/_partial/_single/_footer.scss
+++ b/assets/css/_partial/_single/_footer.scss
@@ -20,6 +20,22 @@
         .dark-theme & {
           color: $global-font-secondary-color-dark;
         }
+
+        a {
+          color: $single-link-color;
+
+          .dark-theme & {
+            color: $single-link-color-dark;
+          }
+
+          &:hover {
+            color: $single-link-hover-color;
+
+            .dark-theme & {
+              color: $single-link-hover-color-dark;
+            }
+          }
+        }
       }
 
       .post-info-license {
@@ -32,10 +48,10 @@
       }
 
       .post-info-md {
+        font-size: 0.8rem;
         width: 8rem;
 
         a {
-          font-size: 0.8rem;
           color: $single-link-color;
 
           .dark-theme & {
diff --git a/assets/css/_variables.scss b/assets/css/_variables.scss
index 6d8f229..c8a56fd 100644
--- a/assets/css/_variables.scss
+++ b/assets/css/_variables.scss
@@ -3,8 +3,11 @@
 // ==============================
 
 // ========== Global ========== //
-// Font family
+// Font and Line Height
 $global-font-family: -apple-system, BlinkMacSystemFont, PingFang SC, Microsoft Yahei, Segoe UI, Helvetica, Arial, sans-serif, Segoe UI Emoji !default;
+$global-font-size: 16px;
+$global-font-weight: 400;
+$global-line-height: 1.5rem;
 
 // Color of the background
 $global-background-color: #fff !default;