🏷️ 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)