fix: font-family 修复字体搭配失效问题

MOxFIVE · Apr 18, 2016 · c5cfa4b · c5cfa4b · MOxFIVE · Apr 18, 2016
1 parent acc93bb
commit c5cfa4b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/source/css/_partial/article.styl b/source/css/_partial/article.styl
@@ -100,7 +100,7 @@
 .article-title {
   color: #696969;
   margin-left: 0px;
-  font-weight: 300;
+  font-weight: 400;
   line-height: 1.3;
   margin-bottom: 20px;
   -webkit-transition: color 0.3s;
@@ -191,7 +191,6 @@
   }
   h2{
     margin: .5em auto;
-    font-weight: bold;
     color: #9c9;
     padding-bottom: 5px;
     border-bottom: 1px solid #ddd;
@@ -210,7 +209,6 @@
     background: rgba(243, 248, 253, .6);
     border: 1px solid #d2e8fa;
     padding: 0.2em 0.6em;
-    font-weight: normal;
     &:hover a {
       text-decoration: underline;
     };
@@ -220,7 +218,6 @@
   }
   h4,h5,h6{
     margin-top: 20px;
-    font-weight: bold;
     color: #574C4C;
     padding-bottom: 5px;
     border-bottom: 1px solid #ddd;

diff --git a/source/css/_partial/highlight.styl b/source/css/_partial/highlight.styl
@@ -17,7 +17,7 @@ $line-numbers
 
 .article-entry
   pre, code
-    font-family: font-mono, font-chs
+    font-family: font-mono, monospace, font-chs
     font-size: 1em
   pre
     @extend $code-block
@@ -67,7 +67,7 @@ $line-numbers
     padding: 15px article-padding 15px 0
     .gist-file
       border: none
-      font-family: font-mono
+      font-family: font-mono monospace
       margin: 0
       .gist-data
         background: none

diff --git a/source/css/_partial/main.styl b/source/css/_partial/main.styl
@@ -78,7 +78,7 @@
 .header-author{
     text-align: center;
     margin: 13px 0;
-    font-family: Roboto, "Roboto", serif;
+    font-family: font-serif, serif;
     font-size: base-font-size + 14;
     transition: 0.3s;
 }

diff --git a/source/css/_variables.styl b/source/css/_variables.styl
@@ -19,10 +19,10 @@ color-pinterest = #cb2027
 color-google = #dd4b39
 
 // Fonts
-font-chs = "Microsoft YaHei", "Hiragino Sans GB", "WenQuanYi Micro Hei", sans-serif
-font-sans = "Lucida Grande", Verdana, "Helvetica Neue", Arial, sans-serif
-font-serif = Times, Georgia, serif
-font-mono = Menlo, Consolas, "Source Code Pro", Inconsolata, Monaco, monospace
+font-chs = "Microsoft YaHei", "Hiragino Sans GB", "WenQuanYi Micro Hei" // sans-serif
+font-sans = "Lucida Grande", Verdana, "Helvetica Neue", Arial // sans-serif
+font-serif = Times, Georgia // serif
+font-mono = Menlo, Consolas, "Source Code Pro", Inconsolata, Monaco // monospace
 font-icon = FontAwesome
 base-font-size = hexo-config("base_font_size")px
 font-size = 14px

diff --git a/source/css/style.styl b/source/css/style.styl
@@ -28,15 +28,16 @@ body
   text-rendering: optimizeLegibility;
   -moz-osx-font-smoothing: grayscale;
   -moz-font-feature-settings: "liga" on;
-  color: rgba(0,0,0,.75);
+  color: #333
   -webkit-overflow-scrolling: touch
 
 ::selection 
   background: rgba(147, 181, 224, .6);
   color: white;
 
 h2,h3,h4,h5,h6 {
-  font-family: font-serif, font-chs;
+  font-family: font-serif, serif;
+  font-weight bold
 }
 h1,h2,h3{
   display: block;