From 09b38d257436a462bd1a58f154a63eed0e0549ac Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Mon, 22 Feb 2021 23:07:12 +0800
Subject: [PATCH] update

---
 layout/_partial/main/navbar/breadcrumb.ejs |  6 +++---
 layout/_partial/sidebar/header.ejs         |  2 +-
 layout/_partial/sidebar/logo.ejs           |  2 +-
 source/css/_layout/main.styl               |  5 +++--
 source/css/_layout/navbar.styl             | 12 ++++++++----
 source/css/_layout/sidebar.styl            | 11 +++++++++--
 6 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/layout/_partial/main/navbar/breadcrumb.ejs b/layout/_partial/main/navbar/breadcrumb.ejs
index e428f32..58e6b97 100644
--- a/layout/_partial/main/navbar/breadcrumb.ejs
+++ b/layout/_partial/main/navbar/breadcrumb.ejs
@@ -1,7 +1,7 @@
 <% if (page.breadcrumb != false) { %>
   <div class='breadcrumb-navigation'>
   <% if (page.layout == 'post') { %>
-    <div class='cap'>
+    <div id='breadcrumb'>
       <a class='cap breadcrumb' href='/'><%- __('btn.home') %></a>
       <span class="sep"></span>
       <a class='cap breadcrumb' href='/'><%- __('btn.blog') %></a>
@@ -19,7 +19,7 @@
       <%- __('meta.created') %>&nbsp;<time datetime='<%- date_xml(page.date) %>'><%- date(page.date, config.date_format) %></time>
     </div>
   <% } else if (page.layout == 'wiki') { %>
-    <div>
+    <div id='breadcrumb'>
       <a class='cap breadcrumb' href='/'><%- __('btn.home') %></a>
       <span class="sep"></span>
       <% if (page.menu_id && theme.sidebar.menu[page.menu_id] && theme.sidebar.menu[page.menu_id].url) { %>
@@ -44,7 +44,7 @@
       <%- __('meta.updated') %>&nbsp;<time datetime='<%- date_xml(page.updated) %>'><%- date(page.updated, config.date_format) %></time>
     </div>
   <% } else { %>
-      <div>
+      <div id='breadcrumb'>
         <a class='cap breadcrumb' href='/'><%- __('btn.home') %></a>
         <span class="sep"></span>
         <a class='cap breadcrumb' href='<%- url_for(page.path) %>'><%- page.title || page.seo_title %></a>
diff --git a/layout/_partial/sidebar/header.ejs b/layout/_partial/sidebar/header.ejs
index f0597b4..fb59f0e 100644
--- a/layout/_partial/sidebar/header.ejs
+++ b/layout/_partial/sidebar/header.ejs
@@ -12,7 +12,7 @@ function layoutMainMenu() {
       el += ' active';
     }
     el += '" href="' + url_for(item.url) + '">';
-    el += '<span>' + __(item.title) + '</span>';
+    el += __(item.title);
     el += '</a>';
   }
   el += '</nav>';
diff --git a/layout/_partial/sidebar/logo.ejs b/layout/_partial/sidebar/logo.ejs
index ba8c1d7..c4faf96 100644
--- a/layout/_partial/sidebar/logo.ejs
+++ b/layout/_partial/sidebar/logo.ejs
@@ -1,6 +1,6 @@
 <div class='logo-wrap'>
   <% if (theme.sidebar.logo.avatar.src || config.avatar) { %>
-    <a class='img' href='<%- theme.sidebar.logo.avatar.href || "/" %>'><img no-lazy src='<%- theme.sidebar.logo.avatar.src || config.avatar %>'/></a>
+    <a class='avatar' href='<%- theme.sidebar.logo.avatar.href || "/" %>'><img no-lazy src='<%- theme.sidebar.logo.avatar.src || config.avatar %>'/></a>
   <% } %>
   <a class='title' href='/'><%- theme.sidebar.logo.title || config.title %></a>
 </div>
diff --git a/source/css/_layout/main.styl b/source/css/_layout/main.styl
index b2c410e..90de1d2 100644
--- a/source/css/_layout/main.styl
+++ b/source/css/_layout/main.styl
@@ -8,12 +8,13 @@
     border-radius: 6px
     .logo-wrap
       margin: 0.5rem 0.75rem
-      .img
+      .avatar
         width: 32px
         height: 32px
+        border: none
       .title
         font-size: 1.5rem
-  nav.menu 
+  nav.menu
     margin: -2px
 
 // pc上右边顶部留白
diff --git a/source/css/_layout/navbar.styl b/source/css/_layout/navbar.styl
index 05464b4..27a1676 100644
--- a/source/css/_layout/navbar.styl
+++ b/source/css/_layout/navbar.styl
@@ -47,12 +47,16 @@ nav.cap
   font-size: $fs-footnote
   color: var(--text-p3)
   font-weight: 500
-  a.cap:hover
-    color: $color-cat-hover
-  div+div
+  div#breadcrumb
+    display: flex
+    align-items: center
+    flex-direction: row
+    a.cap:hover
+      color: $color-cat-hover
+  div#post-meta
     margin-top: 2px
 
 
 @media screen and (max-width: $device-tablet)
   .nav-wrap
-    margin-top: 0
\ No newline at end of file
+    margin-top: 0
diff --git a/source/css/_layout/sidebar.styl b/source/css/_layout/sidebar.styl
index b694bf6..dd16971 100644
--- a/source/css/_layout/sidebar.styl
+++ b/source/css/_layout/sidebar.styl
@@ -13,11 +13,11 @@
   display: flex
   align-items: center
   color: var(--text-p0)
-  a  
+  a
     color: inherit
     display: flex
     align-items: center
-  .img
+  .avatar
     width: 40px
     height: 40px
     flex-shrink: 0
@@ -25,6 +25,9 @@
     border: 2px solid transparent
     overflow: hidden
     margin-right: 1rem
+    trans1 background
+    &:hover
+      background: $color-hover
     img
       object-fit: cover
   .title
@@ -62,6 +65,10 @@ nav.menu
       color: var(--text-p1)
       background: var(--card)
 
+.l_left .menu a.nav-item
+  flex-grow: 1
+  text-align: center
+
 .l_left .widgets
   margin: $gap 0
   overflow: scroll