From dd6053f6b0f4ba376b7be85cf0f3469652a9de9a Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Mon, 6 Apr 2020 12:48:08 +0800
Subject: [PATCH] css

---
 source/css/_defines/color.styl       |  2 +-
 source/css/_defines/layout.styl      |  2 +-
 source/css/_layout/article.styl      | 13 ++++++-------
 source/css/_tag-plugins/folding.styl | 10 +++++-----
 source/css/_tag-plugins/span.styl    |  4 ++++
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/source/css/_defines/color.styl b/source/css/_defines/color.styl
index 44072a1..8007374 100644
--- a/source/css/_defines/color.styl
+++ b/source/css/_defines/color.styl
@@ -43,7 +43,7 @@ $color-block = convert(hexo-config('style.color.block')) || #f6f6f6
 $color-selection = alpha(#2196f3, 0.2)
 
 // code
-$color-inlinecode = convert(hexo-config('style.color.inlinecode')) || #4f5a60
+$color-inlinecode = convert(hexo-config('style.color.inlinecode')) || #f6f6f6
 $color-codeblock = convert(hexo-config('style.color.codeblock')) || #f6f6f6
 // blockquote
 $color-blockquote = convert(hexo-config('style.color.blockquote')) || $color-theme
diff --git a/source/css/_defines/layout.styl b/source/css/_defines/layout.styl
index 40c41ff..93994fa 100644
--- a/source/css/_defines/layout.styl
+++ b/source/css/_defines/layout.styl
@@ -17,7 +17,7 @@ $modal-threshold = 680px
 $navbar-height = convert(hexo-config('style.navbar.height')) || 64px
 
 // gap
-$gap = convert(hexo-config('style.gap.base')) || 16px
+$gap = convert(hexo-config('style.gap.base')) || 16px // base gap
 $gap-h2 = convert(hexo-config('style.gap.h2')) || 48px
 $gap-h3 = convert(hexo-config('style.gap.h3')) || 32px
 $gap-h4 = convert(hexo-config('style.gap.h4')) || 16px
diff --git a/source/css/_layout/article.styl b/source/css/_layout/article.styl
index 6b3482a..6c396bd 100644
--- a/source/css/_layout/article.styl
+++ b/source/css/_layout/article.styl
@@ -94,8 +94,8 @@
     color: $color-hover
   kbd
     border-radius: $border-codeblock * 0.5
-    border: 1px solid darken($color-codeblock, 6)
-    background: $color-codeblock
+    border: 1px solid darken($color-inlinecode, 6)
+    background: $color-inlinecode
     padding-left: 4px
     padding-right: 4px
     margin-left: 2px
@@ -217,14 +217,13 @@
   code
     font-family: $fontfamily-code
     &:not([class])
-      padding: 4px 2px 2px 2px
+      padding: 3px 4px 1px 4px
       margin: 0
       vertical-align: middle
-      border-radius: 2px
-      line-height: 1.45
       font-size: $fontsize-code
-      color: $color-inlinecode
-      background: bgcolor($color-inlinecode, 4)
+      background: $color-inlinecode
+      border-radius: $border-codeblock * 0.5
+      border: 1px solid darken($color-inlinecode, 6)
 
   table:not('.highlight table')
     width: 100%
diff --git a/source/css/_tag-plugins/folding.styl b/source/css/_tag-plugins/folding.styl
index 2725aca..4559e75 100644
--- a/source/css/_tag-plugins/folding.styl
+++ b/source/css/_tag-plugins/folding.styl
@@ -25,8 +25,8 @@ details
         float: right
         content: '+'
   >div.content
-    margin-top: $gap-row
-    margin-bottom: "calc(%s - %s)" % ($gap-row $gap)
+    margin-top: $gap
+    margin-bottom: "calc(%s - %s)" % ($gap $gap)
   &[blue]
     border: 1px solid darken(bgcolor($color-md-blue), 4)
     >summary
@@ -76,13 +76,13 @@ details[open]
       border-bottom: 1px solid darken(bgcolor($color-mac-red), 8)
   >summary
     color: $color-p
-    margin-bottom: $gap-row
+    margin-bottom: $gap
     &:hover
       &:after
         content: '-'
   >div.content>
     p,.tabs,ul,ol,.highlight,div.note
-      margin-top: $gap-row
-      margin-bottom: $gap-row
+      margin-top: $gap
+      margin-bottom: $gap
       &:last-child
         margin-bottom: 0
diff --git a/source/css/_tag-plugins/span.styl b/source/css/_tag-plugins/span.styl
index ac89ae2..3525957 100644
--- a/source/css/_tag-plugins/span.styl
+++ b/source/css/_tag-plugins/span.styl
@@ -7,6 +7,10 @@ p.p.subtitle
     padding-top: 0
 
 span.p,p.p
+  &.logo
+    font-family: $fontfamily-logo
+  &.code
+    font-family: $fontfamily-code
   &.left
     display: block
     text-align: left