🏷️ 2.3.0發佈

source/css/_global/index.styl

@@ -192,6 +192,13 @@ img:not([src])
 
 .img-alt
   margin: -.5rem 0 .5rem
+<<<<<<< HEAD
+=======
+  color: $font-black
+
+  &:hover
+    text-decoration: none !important
+>>>>>>> dev
 
 // hexo tag video
 .video-container
@@ -209,41 +216,17 @@ img:not([src])
     width: 100%
     height: 100%
 
-// tag-hide
-.hide-inline,
-.hide-block
-  & > .hide-button
-    position: relative
-    z-index: 1
-    display: inline-block
-    padding: 0 1rem
-    background: $tag-hide-bg
-    text-align: center
-    cursor: pointer
-
-    &:hover
-      text-decoration: none !important
-
-  & > .hide-content
-    display: none
-
-.hide-inline
-  & > .hide-button
-    margin: 0 .3rem
-
-  & > .hide-content
-    margin: 0 .3rem
-
-.hide-block
-  margin: 0 0 .8rem
-
 .comment_headling
   margin-bottom: 10px
   font-weight: 700
   font-size: 20px
 
 .post-ad
+<<<<<<< HEAD
   margin: 2rem 0 !important
+=======
+  margin: 2rem 0
+>>>>>>> dev
 
 .ad_height
   display: block !important
@@ -256,16 +239,22 @@ img:not([src])
 #nav
   animation: nav-effect 1s
 
+<<<<<<< HEAD
 // #page-header
 // animation: header-effect 1s
+=======
+>>>>>>> dev
 #site_title,
 #site_subtitle
   animation: titlescale 1s
 
-canvas,
+canvas:not(#ribbon-canvas),
 #web_bg
   animation: to_show 4s
 
+#ribbon-canvas
+  animation: ribbon_to_show 4s
+
 .card-announcement-animation
   color: #FF0000
   animation: announ_animation .8s linear infinite
@@ -292,10 +281,14 @@ if hexo-config('avatar.effect') == true
 
 .tocOpenMobile
   .sidebar-toc__title
-    animation: tocsidebarRtoL .5s
+    animation: tocsidebarRtoL .4s
 
   .sidebar-toc__progress
+<<<<<<< HEAD
     animation: tocsidebarRtoL .7s
+=======
+    animation: tocsidebarRtoL .6s
+>>>>>>> dev
 
   .sidebar-toc__content
     animation: tocsidebarRtoL .9s
@@ -322,6 +315,7 @@ if hexo-config('avatar.effect') == true
     opacity: 1
     transform: translateY(0)
 
+<<<<<<< HEAD
 @keyframes header-effect
   0%
     opacity: 0
@@ -334,6 +328,8 @@ if hexo-config('avatar.effect') == true
     opacity: 1
     transform: translateY(0)
 
+=======
+>>>>>>> dev
 @keyframes headerNoOpacity
   0%
     transform: translateY(-50px)
@@ -375,6 +371,13 @@ if hexo-config('avatar.effect') == true
   100%
     opacity: 1
 
+@keyframes ribbon_to_show
+  0%
+    opacity: 0
+
+  100%
+    opacity: hexo-config('canvas_ribbon.alpha')
+
 @keyframes avatar_turn_around
   from
     transform: rotate(0)

source/css/_highlight/highlight.styl

@@ -271,6 +271,3 @@ blockquote
   background: darken($highlight-background, 5)
   color: $highlight-foreground
   font-size: 14px
-
-.highlight-close
-  height: 0 !important

source/css/_layout/aside.styl

@@ -16,14 +16,13 @@
 
   .card-info
     img
-      display: inline-block
       width: 110px
       height: 110px
       border-radius: 70px
-      transition: all .3s
+      transition: all .5s
 
       &:hover
-        transform: rotate(540deg)
+        transform: rotate(360deg)
 
     .author-info
       &__name
@@ -34,23 +33,24 @@
         margin-top: -.3rem
 
     .card-info-data
+      display: table
       padding: .7rem 0
+      width: 100%
+      table-layout: fixed
 
       & > .card-info-data-item
-        display: inline-block
-        width: 33.3%
+        display: table-cell
 
         a
           .headline
-            display: block
             overflow: hidden
             color: $font-black
-            // text-transform: uppercase
             text-overflow: ellipsis
             white-space: nowrap
             font-size: .7rem
 
           .length_num
+            margin-top: -.3rem
             color: $dark-black
             font-size: 1rem
 
@@ -75,7 +75,6 @@
       display: block
       background-color: $light-blue
       color: $button-color
-      text-transform: uppercase
       line-height: 1.6rem
 
       span
@@ -92,7 +91,8 @@
 
   .card-tag-cloud
     a
-      word-break: keep-all
+      display: inline-block
+      padding: 0 .1rem
 
       &:hover
         color: $light-blue !important
@@ -147,20 +147,20 @@
               .aside-post_title
                 height: auto
 
-  .card-archives ul.archive-list,
-  .card-categories ul.aside-category-item
+  .card-archives ul.card-archive-list,
+  .card-categories ul.card-category-list
     margin: 0
     padding: .2rem 0 0
     list-style: none
 
-  .card-archives ul.archive-list > .archive-list-item,
-  .card-categories ul.aside-category-item > .aside-category-list
-    padding: .2rem 1rem
+  .card-archives ul.card-archive-list > .card-archive-list-item,
+  .card-categories ul.card-category-list > .card-category-list-item
+    padding: .15rem 1rem
     cursor: pointer
-    transition: all .3s
+    transition: all .5s
 
     &:hover
-      padding: .2rem .85rem
+      padding: .15rem .85rem
       background-color: $light-blue
 
     a
@@ -180,8 +180,18 @@
           width: 20%
           text-align: right
 
+    &.more
+      span
+        padding-right: .3rem
+        width: auto !important
+        transition: .5s
+
+      &:hover
+        span
+          padding-right: .6rem
+
   .card-categories
-    .aside-category-item
+    .card-category-list
       &.child
         padding: 0 0 0 1.2rem