From b6939a389fc146b103dab8f00c1018c22f16856a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=B4=8D=C9=AA=E1=B4=8D=C9=AA?= <1119186082@qq.com>
Date: Tue, 1 Oct 2019 12:04:06 +0800
Subject: [PATCH] Fix several style issues (#1190)

---
 layout/_macro/post-collapse.swig              |  2 +-
 layout/_partials/header/menu-item.swig        |  2 +-
 layout/_partials/header/menu.swig             |  2 +-
 .../components/post/post-collapse.styl        |  1 -
 .../{post-title.styl => post-header.styl}     | 53 ++++++++++++++++++-
 .../_common/components/post/post-meta.styl    | 47 ----------------
 source/css/_common/components/post/post.styl  |  7 +--
 .../components/third-party/related-posts.styl |  2 +-
 source/css/_common/outline/footer/footer.styl |  1 -
 .../_common/outline/header/github-banner.styl | 13 ++---
 source/css/_common/outline/header/menu.styl   | 12 +++--
 .../css/_common/outline/header/site-meta.styl |  6 +--
 .../_common/outline/sidebar/sidebar-toc.styl  |  5 +-
 .../css/_common/scaffolding/pagination.styl   |  6 +--
 .../css/_common/scaffolding/scaffolding.styl  |  2 +-
 .../scaffolding/tags/group-pictures.styl      |  1 -
 source/css/_common/scaffolding/tags/tabs.styl |  2 +-
 source/css/_mixins/base.styl                  |  9 ----
 source/css/_schemes/Gemini/index.styl         | 27 ++++------
 source/css/_schemes/Mist/_menu.styl           |  8 ---
 source/css/_schemes/Mist/index.styl           |  2 +-
 source/css/_schemes/Muse/_layout.styl         |  1 -
 source/css/_schemes/Muse/_menu.styl           | 21 +++-----
 source/css/_schemes/Pisces/_menu.styl         | 11 +---
 source/css/_schemes/Pisces/_sidebar.styl      |  6 ---
 source/css/_schemes/Pisces/_sub-menu.styl     |  4 +-
 source/css/_variables/Gemini.styl             |  2 +-
 source/css/_variables/Mist.styl               |  2 +-
 source/css/_variables/Muse.styl               |  9 ++--
 source/css/_variables/Pisces.styl             |  2 +-
 source/css/_variables/base.styl               | 18 +++----
 31 files changed, 114 insertions(+), 172 deletions(-)
 rename source/css/_common/components/post/{post-title.styl => post-header.styl} (56%)
 delete mode 100644 source/css/_common/components/post/post-meta.styl

diff --git a/layout/_macro/post-collapse.swig b/layout/_macro/post-collapse.swig
index 766e1380a2..5cc8df6516 100644
--- a/layout/_macro/post-collapse.swig
+++ b/layout/_macro/post-collapse.swig
@@ -15,7 +15,7 @@
     <header class="post-header">
 
       <div class="post-meta">
-        <time class="post-time" itemprop="dateCreated"
+        <time itemprop="dateCreated"
               datetime="{{ moment(post.date).format() }}"
               content="{{ date(post.date, config.date_format) }}">
           {{ date(post.date, 'MM-DD') }}
diff --git a/layout/_partials/header/menu-item.swig b/layout/_partials/header/menu-item.swig
index 7b01ac4f2e..3d28ec4b17 100644
--- a/layout/_partials/header/menu-item.swig
+++ b/layout/_partials/header/menu-item.swig
@@ -8,7 +8,7 @@
 
     {%- set menuText = __('menu.' + name) | replace('menu.', '') %}
     {%- if theme.menu_settings.icons %}
-      {%- set menuIcon = '<i class="menu-item-icon fa fa-fw fa-' + value.split('||')[1] | trim | default('question-circle') + '"></i> <br>' %}
+      {%- set menuIcon = '<i class="fa fa-fw fa-' + value.split('||')[1] | trim | default('question-circle') + '"></i>' %}
     {%- endif %}
 
     {%- set menuBadge = '' %}
diff --git a/layout/_partials/header/menu.swig b/layout/_partials/header/menu.swig
index 608bc78dce..479b9cdfc2 100644
--- a/layout/_partials/header/menu.swig
+++ b/layout/_partials/header/menu.swig
@@ -25,7 +25,7 @@
       <li class="menu-item menu-item-search">
         <a href="javascript:;" class="popup-trigger">
         {%- if theme.menu_settings.icons %}
-          <i class="menu-item-icon fa fa-search fa-fw"></i> <br>{#
+          <i class="fa fa-search fa-fw"></i>{#
         #}{%- endif %}{#
         #}{{ __('menu.search') }}{#
       #}</a>
diff --git a/source/css/_common/components/post/post-collapse.styl b/source/css/_common/components/post/post-collapse.styl
index 76660d2da7..5fc63f0891 100644
--- a/source/css/_common/components/post/post-collapse.styl
+++ b/source/css/_common/components/post/post-collapse.styl
@@ -95,7 +95,6 @@
     display: inline;
     font-size: $font-size-medium;
     font-weight: normal;
-    line-height: inherit;
     margin-bottom: 0;
     margin-top: 0;
 
diff --git a/source/css/_common/components/post/post-title.styl b/source/css/_common/components/post/post-header.styl
similarity index 56%
rename from source/css/_common/components/post/post-title.styl
rename to source/css/_common/components/post/post-header.styl
index d861dc649d..4cdc69f870 100644
--- a/source/css/_common/components/post/post-title.styl
+++ b/source/css/_common/components/post/post-header.styl
@@ -1,3 +1,7 @@
+.posts-expand .post-header {
+  font-size: $font-size-large;
+}
+
 .posts-expand .post-title {
   word-wrap();
   font-weight: $font-weight-normal;
@@ -29,7 +33,6 @@
   border-bottom: none;
   color: $black-light;
   display: inline-block;
-  line-height: 1.2;
   position: relative;
   vertical-align: top;
 
@@ -56,3 +59,51 @@
     margin-left: 5px;
   }
 }
+
+.posts-expand .post-meta {
+  color: $grey-dark;
+  font-family: $font-family-posts;
+  margin: 3px 0 60px 0;
+  text-align: center;
+
+  .post-description {
+    font-size: $font-size-small;
+    margin-top: 2px;
+  }
+
+  time {
+    border-bottom: 1px dashed $grey-dark;
+    cursor: help;
+  }
+}
+
+.post-meta .post-meta-item + .post-meta-item::before {
+  content: '|';
+  margin: 0 .5em;
+}
+
+.post-meta .post-meta-item {
+  font-size: $font-size-smallest;
+}
+
+.post-meta-divider {
+  margin: 0 .5em;
+}
+
+.post-meta-item-icon {
+  margin-right: 3px;
+
+  +tablet-mobile() {
+    display: inline-block;
+  }
+}
+
+.post-meta-item-text {
+  if (!hexo-config('post_meta.item_text')) {
+    display: none;
+  }
+
+  +tablet-mobile() {
+    display: none;
+  }
+}
diff --git a/source/css/_common/components/post/post-meta.styl b/source/css/_common/components/post/post-meta.styl
deleted file mode 100644
index 695fb5dbc7..0000000000
--- a/source/css/_common/components/post/post-meta.styl
+++ /dev/null
@@ -1,47 +0,0 @@
-.posts-expand .post-meta {
-  color: $grey-dark;
-  font-family: $font-family-posts;
-  margin: 3px 0 60px 0;
-  text-align: center;
-
-  .post-description {
-    font-size: $font-size-small;
-    margin-top: 2px;
-  }
-
-  time {
-    border-bottom: 1px dashed $grey-dark;
-    cursor: help;
-  }
-}
-
-.post-meta .post-meta-item + .post-meta-item::before {
-  content: '|';
-  margin: 0 .5em;
-}
-
-.post-meta .post-meta-item {
-  font-size: $font-size-smallest;
-}
-
-.post-meta-divider {
-  margin: 0 .5em;
-}
-
-.post-meta-item-icon {
-  margin-right: 3px;
-
-  +tablet-mobile() {
-    display: inline-block;
-  }
-}
-
-.post-meta-item-text {
-  if (!hexo-config('post_meta.item_text')) {
-    display: none;
-  }
-
-  +tablet-mobile() {
-    display: none;
-  }
-}
diff --git a/source/css/_common/components/post/post.styl b/source/css/_common/components/post/post.styl
index 2c290684cd..466f755181 100644
--- a/source/css/_common/components/post/post.styl
+++ b/source/css/_common/components/post/post.styl
@@ -6,10 +6,6 @@
     font-size: $font-size-large;
   }
 
-  +mobile() {
-    font-size: $font-size-small;
-  }
-
   span.exturl .fa {
     font-size: $font-size-small;
     margin-left: 4px;
@@ -65,11 +61,10 @@
 @import 'post-eof';
 @import 'post-expand';
 @import 'post-gallery';
-@import 'post-meta';
+@import 'post-header';
 @import 'post-nav';
 @import 'post-rtl';
 @import 'post-tags';
-@import 'post-title';
 @import 'post-widgets';
 
 @import 'post-reward' if (hexo-config('reward_settings.enable'));
diff --git a/source/css/_common/components/third-party/related-posts.styl b/source/css/_common/components/third-party/related-posts.styl
index ae48bce700..7548f589f2 100644
--- a/source/css/_common/components/third-party/related-posts.styl
+++ b/source/css/_common/components/third-party/related-posts.styl
@@ -6,7 +6,7 @@
   margin-top: $post-eof-margin-bottom;
 }
 
-ul.popular-posts {
+.popular-posts {
   padding: 0;
 
   .popular-posts-item {
diff --git a/source/css/_common/outline/footer/footer.styl b/source/css/_common/outline/footer/footer.styl
index 7fc9c70b9c..7a21479396 100644
--- a/source/css/_common/outline/footer/footer.styl
+++ b/source/css/_common/outline/footer/footer.styl
@@ -18,7 +18,6 @@
 }
 
 .footer-inner {
-  box-sizing: border-box;
   margin: 0 auto;
   text-align: center;
   width: $content-desktop;
diff --git a/source/css/_common/outline/header/github-banner.styl b/source/css/_common/outline/header/github-banner.styl
index 97f57b21f4..7d78dc13ea 100644
--- a/source/css/_common/outline/header/github-banner.styl
+++ b/source/css/_common/outline/header/github-banner.styl
@@ -15,7 +15,6 @@
 .github-corner {
   $scheme = hexo-config('scheme');
   $bg-color = unquote(hexo-config('android_chrome_color'));
-  $mobile-layout-economy = hexo-config('mobile_layout_economy');
 
   :hover .octo-arm {
     animation: octocat-wave 560ms ease-in-out;
@@ -47,16 +46,10 @@
     }
   }
 
-  +mobile() {
-    svg {
-      if ($scheme == 'Mist') {
+  if ($scheme == 'Mist') {
+    +mobile() {
+      svg {
         top: inherit;
-
-        if ($mobile-layout-economy) {
-          +mobile-small() {
-            margin-top: initial;
-          }
-        }
       }
     }
   }
diff --git a/source/css/_common/outline/header/menu.styl b/source/css/_common/outline/header/menu.styl
index f1a2d5bd78..27f7d82fc0 100644
--- a/source/css/_common/outline/header/menu.styl
+++ b/source/css/_common/outline/header/menu.styl
@@ -16,20 +16,22 @@
   }
 
   a, span.exturl {
-    border-bottom: 1px solid $menu-link-border;
+    border-bottom: 0;
     display: block;
     font-size: $font-size-smaller;
-    line-height: inherit;
     transition-property: border-color;
     the-transition();
 
-    &:hover {
-      border-bottom-color: $menu-link-hover-border;
+    // To prevent hover on external links with touch devices after click.
+    @media (hover: none) {
+      &:hover {
+        border-bottom-color: transparent !important;
+      }
     }
   }
 
   .fa {
-    margin-right: 5px;
+    margin-right: 8px;
   }
 }
 
diff --git a/source/css/_common/outline/header/site-meta.styl b/source/css/_common/outline/header/site-meta.styl
index b4eb4c35eb..945dbbd70b 100644
--- a/source/css/_common/outline/header/site-meta.styl
+++ b/source/css/_common/outline/header/site-meta.styl
@@ -12,7 +12,7 @@
   border-bottom: none;
   color: $brand-color;
   display: inline-block;
-  line-height: $title-font-size;
+  line-height: $font-size-title;
   padding: 0 40px;
   position: relative;
 
@@ -31,7 +31,7 @@
 .site-title {
   display: inline-block;
   font-family: $font-family-logo;
-  font-size: $title-font-size;
+  font-size: $font-size-title;
   font-weight: normal;
   line-height: 1.5;
   vertical-align: top;
@@ -39,7 +39,7 @@
 
 .site-subtitle {
   color: $subtitle-color;
-  font-size: $subtitle-font-size;
+  font-size: $font-size-subtitle;
   margin-top: 10px;
 }
 
diff --git a/source/css/_common/outline/sidebar/sidebar-toc.styl b/source/css/_common/outline/sidebar/sidebar-toc.styl
index c1e0473431..189b18fa06 100644
--- a/source/css/_common/outline/sidebar/sidebar-toc.styl
+++ b/source/css/_common/outline/sidebar/sidebar-toc.styl
@@ -30,15 +30,14 @@
   }
 
   .nav-item {
+    line-height: 1.8;
     overflow: hidden;
     text-overflow: ellipsis;
-
     // text-align: justify;
+
     if (!hexo-config('toc.wrap')) {
       white-space: nowrap;
     }
-
-    line-height: 1.8;
   }
 
   .nav {
diff --git a/source/css/_common/scaffolding/pagination.styl b/source/css/_common/scaffolding/pagination.styl
index 1c72c634af..8c2d287bd2 100644
--- a/source/css/_common/scaffolding/pagination.styl
+++ b/source/css/_common/scaffolding/pagination.styl
@@ -1,4 +1,4 @@
-.page-number-basic {
+$page-number-basic {
   display: inline-block;
   margin: 0 10px;
   padding: 0 11px;
@@ -16,7 +16,7 @@
   text-align: center;
 
   .prev, .next, .page-number {
-    @extend .page-number-basic;
+    @extend $page-number-basic;
     border-bottom: 0;
     border-top: 1px solid $pagination-link-border;
     transition-property: border-color;
@@ -28,7 +28,7 @@
   }
 
   .space {
-    @extend .page-number-basic;
+    @extend $page-number-basic;
     margin: 0;
     padding: 0;
   }
diff --git a/source/css/_common/scaffolding/scaffolding.styl b/source/css/_common/scaffolding/scaffolding.styl
index db7ba26739..8f5ad1e5ee 100644
--- a/source/css/_common/scaffolding/scaffolding.styl
+++ b/source/css/_common/scaffolding/scaffolding.styl
@@ -1,6 +1,6 @@
 //
 // Scaffolding
-// =================================================
+// ==================================================
 @import 'normalize';
 @import 'base';
 @import 'tables';
diff --git a/source/css/_common/scaffolding/tags/group-pictures.styl b/source/css/_common/scaffolding/tags/group-pictures.styl
index 71caca067b..908c0d1a4a 100644
--- a/source/css/_common/scaffolding/tags/group-pictures.styl
+++ b/source/css/_common/scaffolding/tags/group-pictures.styl
@@ -1,7 +1,6 @@
 .post-body .group-picture {
   img {
     border: 0;
-    box-sizing: border-box;
     margin: 0 auto;
     padding: 0 3px;
   }
diff --git a/source/css/_common/scaffolding/tags/tabs.styl b/source/css/_common/scaffolding/tags/tabs.styl
index 8c4b610063..b33eb410aa 100644
--- a/source/css/_common/scaffolding/tags/tabs.styl
+++ b/source/css/_common/scaffolding/tags/tabs.styl
@@ -1,5 +1,5 @@
 // Read tabs border_radius from NexT config and set in "$tbr px" to use it as string variable in this CSS section.
-hexo-config('tabs.border_radius') is a 'unit' ? ($tbr = unit(hexo-config('tabs.border_radius'), px)) : ($tbr = 0);
+$tbr = hexo-config('tabs.border_radius') is a 'unit' ? unit(hexo-config('tabs.border_radius'), px) : 0;
 
 .post-body .tabs {
   margin-bottom: 20px;
diff --git a/source/css/_mixins/base.styl b/source/css/_mixins/base.styl
index cf18af2cbe..a719518a97 100644
--- a/source/css/_mixins/base.styl
+++ b/source/css/_mixins/base.styl
@@ -85,15 +85,6 @@ word-wrap() {
   word-wrap: break-word;
 }
 
-disable-touch-hover() {
-  // To prevent hover on external links with touch devices after click.
-  @media (hover: none) {
-    &:hover {
-      background: none;
-    }
-  }
-}
-
 disable-user-select() {
   -moz-user-select: none;
   -ms-user-select: none;
diff --git a/source/css/_schemes/Gemini/index.styl b/source/css/_schemes/Gemini/index.styl
index 46f905c81b..dbae977a4f 100644
--- a/source/css/_schemes/Gemini/index.styl
+++ b/source/css/_schemes/Gemini/index.styl
@@ -4,9 +4,9 @@
 @import '../Pisces/_sub-menu';
 @import '../Pisces/_sidebar';
 
-// =================================================
+// ==================================================
 // Rewrite _layout.styl
-// =================================================
+// ==================================================
 // Sidebar padding used as main desktop content padding for sidebar padding and post blocks padding too.
 
 // In `source/css/_variables/Pisces.styl` there are variable for main offset:
@@ -19,17 +19,16 @@
 // P.S. If u want to change this paddings u may set this variables into `custom_file_path.variable` (in theme _config.yml).
 
 // So, it will 12px in Desktop, 10px in Tablets and 8px in Mobiles for all possible paddings.
-// =================================================
+// ==================================================
 // Read values from NexT config and set they as local variables to use as string variables (in any CSS section).
 $use-seo = hexo-config('seo');
 
-// =================================================
+// ==================================================
 // Desktop layout styles.
-// =================================================
+// ==================================================
 // Post blocks.
 .content-wrap {
   background: initial;
-  border-radius: initial;
   box-shadow: initial;
   padding: initial;
 }
@@ -69,10 +68,6 @@ $use-seo = hexo-config('seo');
 // Top main padding from header to posts (default 40px).
 .posts-expand {
   padding-top: initial;
-
-  .post-title-link {
-    line-height: inherit;
-  }
 }
 
 // Post navigation items.
@@ -135,9 +130,9 @@ $use-seo = hexo-config('seo');
   }
 }
 
-// =================================================
+// ==================================================
 // Headers.
-// =================================================
+// ==================================================
 .post-body {
   h1, h2 {
     border-bottom: 1px solid $body-bg-color;
@@ -158,9 +153,9 @@ $use-seo = hexo-config('seo');
   }
 }
 
-// =================================================
+// ==================================================
 // > 768px & < 991px
-// =================================================
+// ==================================================
 +tablet() {
   // Posts in blocks.
   .content-wrap {
@@ -203,9 +198,9 @@ $use-seo = hexo-config('seo');
   }
 }
 
-// =================================================
+// ==================================================
 // < 767px
-// =================================================
+// ==================================================
 +mobile() {
   // Posts in blocks.
   .content-wrap {
diff --git a/source/css/_schemes/Mist/_menu.styl b/source/css/_schemes/Mist/_menu.styl
index 12605c5a20..bc70ebb0f5 100644
--- a/source/css/_schemes/Mist/_menu.styl
+++ b/source/css/_schemes/Mist/_menu.styl
@@ -23,7 +23,6 @@
 }
 
 .menu {
-  // float: right;
   margin: 0;
 
   +mobile() {
@@ -31,10 +30,6 @@
     padding: 0;
   }
 
-  br {
-    display: none;
-  }
-
   .menu-item {
     margin: 0;
 
@@ -63,7 +58,6 @@
     }
 
     a, span.exturl {
-      border: 0;
       border-radius: 2px;
       padding: 0 10px;
       transition-property: background;
@@ -75,8 +69,6 @@
       &:hover {
         @extend .menu-item-active a;
       }
-
-      disable-touch-hover();
     }
   }
 
diff --git a/source/css/_schemes/Mist/index.styl b/source/css/_schemes/Mist/index.styl
index e56ecf8c05..b229eeb59e 100644
--- a/source/css/_schemes/Mist/index.styl
+++ b/source/css/_schemes/Mist/index.styl
@@ -1,6 +1,6 @@
 //
 // Mist scheme
-// =================================================
+// ==================================================
 @import '_base';
 @import '_header';
 @import '_logo';
diff --git a/source/css/_schemes/Muse/_layout.styl b/source/css/_schemes/Muse/_layout.styl
index fcbabd2377..4a8e09d7ce 100644
--- a/source/css/_schemes/Muse/_layout.styl
+++ b/source/css/_schemes/Muse/_layout.styl
@@ -10,7 +10,6 @@
   }
 }
 
-// embed tag
 embed {
   display: block;
   margin: 0 auto 25px auto;
diff --git a/source/css/_schemes/Muse/_menu.styl b/source/css/_schemes/Muse/_menu.styl
index a0d201822c..8e1dce3bdc 100644
--- a/source/css/_schemes/Muse/_menu.styl
+++ b/source/css/_schemes/Muse/_menu.styl
@@ -21,7 +21,7 @@
 }
 
 .menu-item-active a {
-  border-bottom-color: $menu-link-hover-border;
+  border-bottom: 1px solid $menu-link-hover-border;
   color: $black-deep;
 
   +mobile() {
@@ -52,12 +52,6 @@
     }
   }
 
-  br {
-    +mobile() {
-      display: none;
-    }
-  }
-
   a, span.exturl {
     +mobile() {
       padding: 5px 10px;
@@ -66,21 +60,20 @@
     &:hover {
       @extend .menu-item-active a;
     }
-
-    // To prevent hover on external links with touch devices after click.
-    @media (hover: none) {
-      &:hover {
-        border-bottom-color: transparent !important;
-      }
-    }
   }
 
   .fa {
     +tablet() {
+      display: block;
+      line-height: 2;
+      margin-right: 0;
       width: 100%;
     }
 
     +desktop() {
+      display: block;
+      line-height: 2;
+      margin-right: 0;
       width: 100%;
     }
   }
diff --git a/source/css/_schemes/Pisces/_menu.styl b/source/css/_schemes/Pisces/_menu.styl
index 332608b88e..7be3e3ad00 100644
--- a/source/css/_schemes/Pisces/_menu.styl
+++ b/source/css/_schemes/Pisces/_menu.styl
@@ -19,9 +19,8 @@
 .menu-item-active a {
   background: #f9f9f9;
   border-bottom-color: white;
-  $badges = hexo-config('menu_settings.badges');
 
-  if (!$badges) {
+  if (!hexo-config('menu_settings.badges')) {
     &::after {
       background-color: $grey;
       border-radius: 50%;
@@ -41,8 +40,6 @@
   margin: 0;
 
   a, span.exturl {
-    box-sizing: border-box;
-    line-height: inherit;
     padding: 5px 20px;
     position: relative;
     text-align: left;
@@ -52,8 +49,6 @@
     &:hover {
       @extend .menu-item-active a;
     }
-
-    disable-touch-hover();
   }
 
   .badge {
@@ -71,10 +66,6 @@
     vertical-align: middle;
     white-space: nowrap;
   }
-
-  br {
-    display: none;
-  }
 }
 
 .btn-bar {
diff --git a/source/css/_schemes/Pisces/_sidebar.styl b/source/css/_schemes/Pisces/_sidebar.styl
index 973b108c76..9582914e13 100644
--- a/source/css/_schemes/Pisces/_sidebar.styl
+++ b/source/css/_schemes/Pisces/_sidebar.styl
@@ -16,7 +16,6 @@
   background: white;
   border-radius: $border-radius;
   box-shadow: $box-shadow;
-  // padding: 20px 10px 0;
   box-sizing: border-box;
   color: $text-color;
   width: $sidebar-desktop;
@@ -35,10 +34,6 @@
   }
 }
 
-.site-author {
-  clearfix();
-}
-
 .site-state-item {
   padding: 0 10px;
 }
@@ -66,7 +61,6 @@
 }
 
 .links-of-author {
-  // clearfix();
   display: flex;
   flex-wrap: wrap;
   justify-content: center;
diff --git a/source/css/_schemes/Pisces/_sub-menu.styl b/source/css/_schemes/Pisces/_sub-menu.styl
index 3b819c7e3f..1fd996dae3 100644
--- a/source/css/_schemes/Pisces/_sub-menu.styl
+++ b/source/css/_schemes/Pisces/_sub-menu.styl
@@ -28,9 +28,7 @@
       border-bottom-color: $sidebar-highlight;
     }
 
-    $badges = hexo-config('menu_settings.badges');
-
-    if (!$badges) {
+    if (!hexo-config('menu_settings.badges')) {
       &::after {
         content: initial;
       }
diff --git a/source/css/_variables/Gemini.styl b/source/css/_variables/Gemini.styl
index 193dde833c..7e824562e6 100644
--- a/source/css/_variables/Gemini.styl
+++ b/source/css/_variables/Gemini.styl
@@ -1,5 +1,5 @@
 // Variables of Gemini scheme
-// =================================================
+// ==================================================
 
 @import "Pisces.styl";
 
diff --git a/source/css/_variables/Mist.styl b/source/css/_variables/Mist.styl
index d8400d8f59..a8711e0bf8 100644
--- a/source/css/_variables/Mist.styl
+++ b/source/css/_variables/Mist.styl
@@ -1,5 +1,5 @@
 // Variables of Mist scheme
-// =================================================
+// ==================================================
 
 @import "Muse.styl";
 
diff --git a/source/css/_variables/Muse.styl b/source/css/_variables/Muse.styl
index ce30b8cbff..60f7ff1f8f 100644
--- a/source/css/_variables/Muse.styl
+++ b/source/css/_variables/Muse.styl
@@ -1,5 +1,8 @@
 // Variables of Muse scheme
-// =================================================
+// ==================================================
 
-$sidebar-width                = hexo-config('sidebar.width') is a 'unit' ? hexo-config('sidebar.width') : 320;
-$sidebar-desktop              = unit($sidebar-width, 'px');
+$sidebar-width           = hexo-config('sidebar.width') is a 'unit' ? hexo-config('sidebar.width') : 320;
+$sidebar-desktop         = unit($sidebar-width, 'px');
+
+// Menu
+$menu-link-hover-border  = $black-deep;
diff --git a/source/css/_variables/Pisces.styl b/source/css/_variables/Pisces.styl
index 68aebe11a2..3c7744dcb7 100644
--- a/source/css/_variables/Pisces.styl
+++ b/source/css/_variables/Pisces.styl
@@ -1,5 +1,5 @@
 // Variables of Pisces scheme
-// =================================================
+// ==================================================
 
 // Settings for some of the most global styles.
 // --------------------------------------------------
diff --git a/source/css/_variables/base.styl b/source/css/_variables/base.styl
index 4f5741eb14..d2d44c2306 100644
--- a/source/css/_variables/base.styl
+++ b/source/css/_variables/base.styl
@@ -1,6 +1,6 @@
 //
 // Variables
-// =================================================
+// ==================================================
 
 
 // Colors
@@ -69,8 +69,8 @@ $font-family-headings     = get_font_family('headings'), $font-family-base if ge
 $font-family-posts        = $font-family-base;
 $font-family-posts        = get_font_family('posts'), $font-family-base if get_font_family('posts');
 
-$font-family-monospace    = consolas, Menlo, $font-family-chinese, monospace;
-$font-family-monospace    = get_font_family('codes'), consolas, Menlo, $font-family-chinese, monospace if get_font_family('codes');
+$font-family-monospace    = consolas, Menlo, monospace, $font-family-chinese;
+$font-family-monospace    = get_font_family('codes'), consolas, Menlo, monospace, $font-family-chinese if get_font_family('codes');
 
 $font-family-icons        = 'FontAwesome';
 
@@ -97,7 +97,7 @@ $font-size-largest        = 1.375em;
 
 // Headings font size
 $font-size-headings-step  = .125em;
-$font-size-headings-base  = 1.875em;
+$font-size-headings-base  = 1.625em;
 $font-size-headings-base  = unit(hexo-config('font.headings.size'), em) if hexo-config('font.headings.size') is a 'unit';
 
 
@@ -199,16 +199,12 @@ $brand-color                    = white;
 $brand-hover-color              = white;
 $brand-bg                       = $black-deep;
 
-$title-font-size                = $font-size-largest;
-$title-font-size                = unit(hexo-config('font.title.size'), em) if hexo-config('font.title.size') is a 'unit';
-$subtitle-font-size             = $font-size-smaller;
+$font-size-title                = $font-size-largest;
+$font-size-title                = unit(hexo-config('font.title.size'), em) if hexo-config('font.title.size') is a 'unit';
+$font-size-subtitle             = $font-size-smaller;
 $subtitle-color                 = $grey-dark;
 $site-subtitle-color            = $grey-dark;
 
-// Menu
-$menu-link-border               = transparent;
-$menu-link-hover-border         = $black-deep;
-
 
 // Posts Collpase
 // --------------------------------------------------