v1.6.2

xugaoyi · Dec 12, 2020 · 34ad055 · 34ad055
1 parent a16232c
commit 34ad055
Show file tree

Hide file tree

Showing 16 changed files with 88 additions and 40 deletions.
diff --git a/docs/05.关于/01.关于.md b/docs/05.关于/01.关于.md
@@ -17,7 +17,8 @@ article: false
 
 ### 🎨Theme
 
-[![ReadMe Card](https://github-readme-stats.vercel.app/api/pin/?username=xugaoyi&repo=vuepress-theme-vdoing)](https://github.com/xugaoyi/vuepress-theme-vdoing)
+[<img src="https://github-readme-stats.vercel.app/api/pin/?username=xugaoyi&amp;repo=vuepress-theme-vdoing" alt="ReadMe Card" class="no-zoom">](https://github.com/xugaoyi/vuepress-theme-vdoing)
+[<img src="https://github-readme-stats.vercel.app/api/pin/?username=xugaoyi&amp;repo=vuepress-theme-vdoing-doc" alt="ReadMe Card" class="no-zoom">](https://doc.xugaoyi.com/vuepress-theme-vdoing-doc/)
 
 本站主题是 [`Vdoing`](https://github.com/xugaoyi/vuepress-theme-vdoing)，这是一款简洁高效的VuePress 知识管理&博客 主题。旨在轻松打造一个`结构化`与`碎片化`并存的个人在线知识库&博客，让你的知识海洋像一本本书一样清晰易读。配合多维索引，让每一个知识点都可以快速定位！ 更多[详情](https://github.com/xugaoyi/vuepress-theme-vdoing)。
 

diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
     "vuepress-plugin-one-click-copy": "^1.0.2",
     "vuepress-plugin-thirdparty-search": "^1.0.2",
     "vuepress-plugin-zooming": "^1.1.7",
-    "vuepress-theme-vdoing": "^1.6.1",
+    "vuepress-theme-vdoing": "^1.6.2",
     "yamljs": "^0.3.0"
   },
   "dependencies": {

diff --git a/theme-vdoing/components/ArchivesPage.vue b/theme-vdoing/components/ArchivesPage.vue
@@ -11,15 +11,15 @@
       <ul>
         <template v-for="(item, index) in postsList">
           <li
+              v-if="(year = getYear(index)) !== getYear(index-1)"
             class="year"
-            v-if="(year = getYear(index)) !== getYear(index-1)"
             :key="index+$sortPostsByDate.length"
           >
             <h2>{{year}}</h2>
           </li>
           <li :key="index">
             <router-link :to="item.path">
-              <span>{{ getDate(item) }}</span>
+              <i>{{ getDate(item) }}</i>
               {{item.title}}
             </router-link>
           </li>
@@ -111,32 +111,54 @@ export default {
       &.year
         position sticky
         top $navbarHeight
-        background var(--mainBg)
         z-index 1
+        width: 80px
+        margin-bottom -1.8rem
       &.year:not(:first-child)
         margin-top 3.5rem
       h2
-        margin-bottom 0.8rem
+        margin-bottom 0.5rem
         font-weight 400
         padding 0.5rem 0
+        border none
+        display inline-block
+        background var(--mainBg)
+        color $accentColor
       a
         display block
         color var(--textColor)
         transition padding 0.3s
-        padding 0.5rem 2rem
+        padding 0.4rem 1.2rem
+        margin-left 4.5rem
+        border-left 1px solid var(--borderColor)
         line-height 1.2rem
+        position: relative
         &:hover
-          padding-left 2.5rem
-          color $accentColor
+          padding-left 1.5rem
+          color $activeColor
           background #f9f9f9
+          &::before
+            transform scale(2)
+            background $activeColor
+        &::before
+          content ''
+          display block
+          width .3rem
+          height .3rem
+          border-radius 50%
+          background var(--borderColor)
+          position: absolute;
+          top .9rem
+          left -0.18rem
+          transition all .5s
         @media (max-width $contentWidth + 80)
           padding 0.5rem 1rem
           font-weight normal
           &:hover
             padding-left 1.5rem
-        span
+        i
           opacity 0.6
-          font-size 0.85rem
+          font-size 0.9rem
           font-weight 400
           margin-right 0.3rem
     .loadmore

diff --git a/theme-vdoing/components/BloggerBar.vue b/theme-vdoing/components/BloggerBar.vue
@@ -45,21 +45,23 @@ export default {
 .blogger-wrapper
   height auto
   display inline-table
+  padding-top 0!important
+  overflow hidden
   .avatar
-    width 235px
-    height 235px
+    width 100%
+    // height 235px
     overflow hidden
     @media (max-width 900px)
-      width 205px
-      height 205px
+      // width 205px
+      // height 205px
     img
       width 100%
       height 100%
   .icons
     // border 1px solid var(--borderColor)
     border-top none
-    height 40px
-    line-height 40px
+    height 35px
+    line-height 35px
     a
       font-size 20px
       width 33%
@@ -71,9 +73,9 @@ export default {
       &:hover
         color $accentColor
   .blogger
-    margin 12px 0 2px 0
+    padding 0.3rem 0.95rem 0 0.95rem
     .name
-      font-size 1.4rem
+      font-size 1.3rem
       display block
       margin-bottom 6px
     .slogan

diff --git a/theme-vdoing/components/Catalogue.vue b/theme-vdoing/components/Catalogue.vue
@@ -177,15 +177,22 @@ dl, dd
           opacity 1
       dd
         margin-top 0.7rem
+        margin-left 1rem
       a:not(.header-anchor)
         margin-bottom 0.5rem
         display inline-block
         width 50%
+        &:hover
+          color $activeColor
+          text-decoration none
         @media (max-width $MQMobileNarrow)
           width 100%
       .sub-cat-wrap
         margin 5px 0 8px 0
         font-size .95rem
+        &> a
+          padding-left 1rem
+          box-sizing border-box
         .sub-title
           margin-top -($navbarHeight)
           padding-top $navbarHeight

diff --git a/theme-vdoing/components/CategoriesBar.vue b/theme-vdoing/components/CategoriesBar.vue
@@ -20,7 +20,7 @@
         to="/categories/"
         v-if="length !== 'all' && length < categoriesData.length"
         class="more"
-      >更多...</router-link>
+      >更多 ...</router-link>
     </div>
   </div>
 </template>
@@ -59,29 +59,33 @@ export default {
     color var(--textColor)
     opacity 0.9
     font-size 1.2rem
+    padding 0 .95rem
+    &::before
+      margin-right 0.3rem
   .categories
     margin-top 0.6rem
     a
       display block
-      padding 8px 0.3rem 7px 0.3rem
+      padding 8px .95rem 7px .95rem
       color var(--textColor)
       opacity 0.8
       font-size 0.95rem
       line-height 0.95rem
       position relative
-      transition all 0.3s
-      border-bottom 1px solid var(--borderColor)
+      transition all .2s
+      border-left 2px solid transparent
       margin-top -1px
       overflow hidden
       white-space nowrap
       text-overflow ellipsis
       @media (max-width $MQMobile)
         font-weight 400
       &.more
+        // color $accentColor
+      &:not(.active):hover
         color $accentColor
-      &:hover
-        color $accentColor
-        padding-left 0.6rem
+        background #f8f8f8
+        border-color $accentColor
         span
           opacity 0.8
       span
@@ -103,4 +107,7 @@ export default {
         padding-left 0.8rem
         border-radius 1px
         border-color transparent
+.theme-mode-dark .categories-wrapper .categories a:not(.active):hover,
+.theme-mode-read .categories-wrapper .categories a:not(.active):hover
+  background var(--customBlockBg)
 </style>
diff --git a/theme-vdoing/components/CategoriesPage.vue b/theme-vdoing/components/CategoriesPage.vue
@@ -75,8 +75,8 @@ export default {
     }
   },
   watch: {
-    '$route.query.category' () {
-      this.category = this.$route.query.category
+    '$route.query.category' (category) {
+      this.category = category ? decodeURIComponent(category) : ''
       if (this.category) {
         this.total = this.$groupPosts.categories[this.category].length
       } else {

diff --git a/theme-vdoing/components/MainLayout.vue b/theme-vdoing/components/MainLayout.vue
@@ -27,13 +27,14 @@
       padding 1rem 1.5rem 0
   .main-right
     >*
-      width 265px
+      width 255px
       box-sizing border-box
       @media (max-width 900px)
         width 235px
     .card-box
       margin 0 0 0.9rem 0.9rem
-      padding 0.95rem
+      padding-top 0.95rem
+      padding-bottom 0.95rem
 // 719px以下
 @media (max-width $MQMobile)
   .main-wrapper

diff --git a/theme-vdoing/components/PostList.vue b/theme-vdoing/components/PostList.vue
@@ -176,7 +176,7 @@ export default {
       top -1px
       right 0
       font-size 2.5rem
-      color $accentColor
+      color $activeColor
       opacity 0.85
     .title-wrapper
       a

diff --git a/theme-vdoing/components/RightMenu.vue b/theme-vdoing/components/RightMenu.vue
@@ -65,7 +65,7 @@ export default {
       overflow-y auto
     .right-menu-item
       padding 4px 15px
-      border-left 0.15rem solid var(--borderColor)
+      border-left 0.13rem solid var(--borderColor)
       &.level3
         padding-left 28px
       &.active

diff --git a/theme-vdoing/components/SidebarButton.vue b/theme-vdoing/components/SidebarButton.vue
@@ -51,7 +51,8 @@
     color #888
     border-radius 50%
     padding 0
-    transition left 0.2s ease
+    // transition left 0.2s ease
+    transition all .2s
     &:hover
       background $accentColor
       color #fff

diff --git a/theme-vdoing/components/TagsBar.vue b/theme-vdoing/components/TagsBar.vue
@@ -71,10 +71,13 @@ export default {
 
 <style lang='stylus'>
 .tags-wrapper
+  padding 0 .95rem
   .title
     color var(--textColor)
     opacity 0.9
     font-size 1.2rem
+    &::before
+      margin-right 0.3rem
   .tags
     text-align justify
     padding 0.8rem 0.5rem 0.5rem 0.5rem

diff --git a/theme-vdoing/components/TagsPage.vue b/theme-vdoing/components/TagsPage.vue
@@ -66,8 +66,9 @@ export default {
     }
   },
   watch: {
-    '$route.query.tag' () {
-      this.tag = decodeURIComponent(this.$route.query.tag)
+    '$route.query.tag' (tag) {
+      this.tag = tag ? decodeURIComponent(tag) : ''
+
       if (this.tag) {
         this.total = this.$groupPosts.tags[this.tag].length
       } else {

diff --git a/theme-vdoing/package.json b/theme-vdoing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vuepress-theme-vdoing",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "Vdoing theme for VuePress. 一个基于VuePress的知识管理兼博客主题。",
   "author": {
     "name": "gaoyi(Evan) Xu"

diff --git a/theme-vdoing/styles/index.styl b/theme-vdoing/styles/index.styl
@@ -48,7 +48,9 @@ a,input,button
   border-radius 5px
   background var(--mainBg)
   box-shadow 0 1px 2px 0 rgba(0,0,0,.1)
-
+  transition box-shadow .5s
+  &:hover
+    box-shadow 0 1px 15px 0 rgba(0,0,0,.1)
 
 .blur // 模糊滤镜
   backdrop-filter saturate(200%) blur(20px)
@@ -195,7 +197,7 @@ p,pre,.custom-block
   {$contentClass}:not(.custom) > &
       &:first-child
         margin-top 2rem
-        
+
 
 h1
   font-size 1.8rem

diff --git a/theme-vdoing/styles/palette.styl b/theme-vdoing/styles/palette.styl
@@ -24,9 +24,10 @@
 //***vdoing主题-变量***//
 
 // 颜色
- 
+
 $bannerTextColor = #fff // 首页banner区(博客标题)文本颜色
 $accentColor = #11A8CD
+$activeColor = #ff5722
 $arrowBgColor = #ccc
 $badgeTipColor = #42b983
 $badgeWarningColor = darken(#ffe564, 35%)
@@ -82,4 +83,4 @@ $lineNumbersWrapperWidth = 2.5rem
   --borderColor: rgba(0,0,0,.15)
   --codeBg: #282c34
   --codeColor: #fff
-  codeThemeDark()
+  codeThemeDark()