From d194052d7e40360f972b81172b379310723cfd09 Mon Sep 17 00:00:00 2001
From: Mimi <1119186082@qq.com>
Date: Sat, 6 Jun 2020 23:48:29 +0800
Subject: [PATCH] Optimize the style of custom-logo and sidebar-inner

---
 layout/_partials/header/brand.njk               | 12 +++---------
 source/css/_common/components/components.styl   |  1 -
 .../_common/components/pages/breadcrumb.styl    |  1 -
 .../css/_common/components/post/post-eof.styl   |  1 -
 .../css/_common/outline/header/site-meta.styl   |  8 ++++++++
 .../_common/outline/sidebar/sidebar-author.styl |  2 --
 source/css/_common/outline/sidebar/sidebar.styl |  1 -
 .../css/_common/outline/sidebar/site-state.styl |  6 ++----
 source/css/_common/scaffolding/pagination.styl  |  2 +-
 source/css/_schemes/Muse/_header.styl           | 17 +----------------
 source/css/_schemes/Pisces/_header.styl         |  8 --------
 source/css/_schemes/Pisces/_sidebar.styl        |  3 +--
 12 files changed, 16 insertions(+), 46 deletions(-)

diff --git a/layout/_partials/header/brand.njk b/layout/_partials/header/brand.njk
index cc12f4e..4090a4b 100644
--- a/layout/_partials/header/brand.njk
+++ b/layout/_partials/header/brand.njk
@@ -9,13 +9,9 @@
     </div>
   </div>
 
-  <div class="site-meta{%- if theme.custom_logo %} custom-logo{%- endif %}">
+  <div class="site-meta">
     {%- if theme.custom_logo and theme.scheme === 'Muse' %}
-      <div class="site-meta-headline">
-        <a>
-          <img class="custom-logo-image" src="{{ theme.custom_logo }}" alt="{{ title }}">
-        </a>
-      </div>
+      <img class="custom-logo-image" src="{{ theme.custom_logo }}" alt="{{ title }}">
     {%- endif %}
 
     <a href="{{ config.root }}" class="brand" rel="start">
@@ -27,9 +23,7 @@
       <p class="site-subtitle" itemprop="description">{{ subtitle }}</p>
     {%- endif %}
     {%- if theme.custom_logo and (theme.scheme === 'Gemini' or theme.scheme === 'Pisces') %}
-      <a>
-        <img class="custom-logo-image" src="{{ theme.custom_logo }}" alt="{{ title }}">
-      </a>
+      <img class="custom-logo-image" src="{{ theme.custom_logo }}" alt="{{ title }}">
     {%- endif %}
   </div>
 
diff --git a/source/css/_common/components/components.styl b/source/css/_common/components/components.styl
index 023906e..8b0e079 100644
--- a/source/css/_common/components/components.styl
+++ b/source/css/_common/components/components.styl
@@ -1,7 +1,6 @@
 if (hexo-config('back2top.enable')) {
   .back-to-top {
     font-size: $b2t-font-size;
-    text-align: center;
     the-transition();
   }
 
diff --git a/source/css/_common/components/pages/breadcrumb.styl b/source/css/_common/components/pages/breadcrumb.styl
index be787ba..c1965de 100644
--- a/source/css/_common/components/pages/breadcrumb.styl
+++ b/source/css/_common/components/pages/breadcrumb.styl
@@ -3,7 +3,6 @@ ul.breadcrumb {
   list-style: none;
   margin: 1em 0;
   padding: 0 2em;
-  text-align: center;
 
   li {
     display: inline;
diff --git a/source/css/_common/components/post/post-eof.styl b/source/css/_common/components/post/post-eof.styl
index 8a53af7..54cdee3 100644
--- a/source/css/_common/components/post/post-eof.styl
+++ b/source/css/_common/components/post/post-eof.styl
@@ -2,7 +2,6 @@
   background: $grey-light;
   height: 1px;
   margin: $post-eof-margin-top auto $post-eof-margin-bottom;
-  text-align: center;
   width: 8%;
 
   .post-block:last-of-type & {
diff --git a/source/css/_common/outline/header/site-meta.styl b/source/css/_common/outline/header/site-meta.styl
index 85785b8..566b409 100644
--- a/source/css/_common/outline/header/site-meta.styl
+++ b/source/css/_common/outline/header/site-meta.styl
@@ -7,6 +7,14 @@
   }
 }
 
+.custom-logo-image {
+  margin-top: 20px;
+
+  +tablet-mobile() {
+    display: none;
+  }
+}
+
 .brand {
   border-bottom: none;
   color: var(--brand-color);
diff --git a/source/css/_common/outline/sidebar/sidebar-author.styl b/source/css/_common/outline/sidebar/sidebar-author.styl
index 5b5254b..d5bb7f6 100644
--- a/source/css/_common/outline/sidebar/sidebar-author.styl
+++ b/source/css/_common/outline/sidebar/sidebar-author.styl
@@ -24,12 +24,10 @@ if (hexo-config('avatar.rotated')) {
   color: $site-author-name-color;
   font-weight: $site-author-name-weight;
   margin: $site-author-name-margin;
-  text-align: center;
 }
 
 .site-description {
   color: $site-description-color;
   font-size: $site-description-font-size;
   margin-top: $site-description-margin-top;
-  text-align: center;
 }
diff --git a/source/css/_common/outline/sidebar/sidebar.styl b/source/css/_common/outline/sidebar/sidebar.styl
index cec7152..d2660fd 100644
--- a/source/css/_common/outline/sidebar/sidebar.styl
+++ b/source/css/_common/outline/sidebar/sidebar.styl
@@ -22,7 +22,6 @@
 
 .cc-license {
   margin-top: 10px;
-  text-align: center;
 
   .cc-opacity {
     border-bottom: none;
diff --git a/source/css/_common/outline/sidebar/site-state.styl b/source/css/_common/outline/sidebar/site-state.styl
index d8663e5..e77c5f0 100644
--- a/source/css/_common/outline/sidebar/site-state.styl
+++ b/source/css/_common/outline/sidebar/site-state.styl
@@ -4,19 +4,18 @@
   line-height: 1.4;
   margin-top: 10px;
   overflow: hidden;
-  text-align: center;
   white-space: nowrap;
 }
 
 .site-state-item {
-  padding: 0 15px;
-
   &:not(:first-child) {
     border-left: 1px solid $site-state-item-border-color;
   }
 
   a {
     border-bottom: none;
+    display: block;
+    padding: 0 15px;
   }
 }
 
@@ -24,7 +23,6 @@
   display: block;
   font-size: $site-state-item-count-font-size;
   font-weight: 600;
-  text-align: center;
 }
 
 .site-state-item-name {
diff --git a/source/css/_common/scaffolding/pagination.styl b/source/css/_common/scaffolding/pagination.styl
index ca4eeb2..f09a9cb 100644
--- a/source/css/_common/scaffolding/pagination.styl
+++ b/source/css/_common/scaffolding/pagination.styl
@@ -47,7 +47,7 @@ $page-number-basic {
 
   .page-number.current {
     background: $pagination-active-bg;
-    border-top-color: $pagination-active-border;
+    border-color: $pagination-active-border;
     color: $pagination-active-color;
   }
 }
diff --git a/source/css/_schemes/Muse/_header.styl b/source/css/_schemes/Muse/_header.styl
index 1a60d34..9dcb8e0 100644
--- a/source/css/_schemes/Muse/_header.styl
+++ b/source/css/_schemes/Muse/_header.styl
@@ -1,21 +1,6 @@
-.custom-logo {
-  .site-meta-headline {
-    text-align: center;
-  }
-
-  .site-title {
-    color: $black-deep;
-    margin: 10px auto 0;
-
-    a {
-      border: 0;
-    }
-  }
-}
-
 .custom-logo-image {
   background: white;
-  margin: 0 auto;
+  margin: 0 auto 10px;
   max-width: 150px;
   padding: 5px;
 }
diff --git a/source/css/_schemes/Pisces/_header.styl b/source/css/_schemes/Pisces/_header.styl
index 4d21664..ce9f83f 100644
--- a/source/css/_schemes/Pisces/_header.styl
+++ b/source/css/_schemes/Pisces/_header.styl
@@ -17,11 +17,3 @@
 .site-subtitle {
   margin: 10px 10px 0;
 }
-
-.custom-logo-image {
-  margin-top: 20px;
-
-  +tablet-mobile() {
-    display: none;
-  }
-}
diff --git a/source/css/_schemes/Pisces/_sidebar.styl b/source/css/_schemes/Pisces/_sidebar.styl
index b501d1c..5e69061 100644
--- a/source/css/_schemes/Pisces/_sidebar.styl
+++ b/source/css/_schemes/Pisces/_sidebar.styl
@@ -36,7 +36,7 @@
   }
 }
 
-.site-state-item {
+.site-state-item a {
   padding: 0 10px;
 }
 
@@ -44,7 +44,6 @@
   border-bottom: 1px dotted $grey-light;
   border-top: 1px dotted $grey-light;
   margin-top: 10px;
-  text-align: center;
 
   a {
     border: 0;