perf: 移除 Merriweather 字体

AlanDecode · May 26, 2019 · 55bd981 · 55bd981
1 parent 566933f
commit 55bd981
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/functions.php b/functions.php
@@ -55,7 +55,7 @@ function themeConfig($form) {
     // 高级设置
     $reward=new Typecho_Widget_Helper_Form_Element_Text('reward', NULL, '', '打赏二维码', '图片链接，只允许一张图片，更多请自行合成。');
     $form->addInput($reward);
-    $serifincontent=new Typecho_Widget_Helper_Form_Element_Radio('serifincontent',array('0'=>'不启用','1'=>'启用'),'0','文章内容使用衬线体','是否对文章内容启用衬线体（中文为思源宋体，西文为 Droid Serif）。此服务由 Google Fonts 提供，可能会有加载较慢的情况。');
+    $serifincontent=new Typecho_Widget_Helper_Form_Element_Radio('serifincontent',array('0'=>'不启用','1'=>'启用'),'0','文章内容使用衬线体','是否对文章内容启用衬线体（思源宋体）。此服务由 Google Fonts 提供，可能会有加载较慢的情况。');
     $form->addInput($serifincontent);
     $lazyload=new Typecho_Widget_Helper_Form_Element_Radio('lazyload',array('0'=>'不启用','1'=>'启用'),'0','图片懒加载','是否启用图片懒加载。');
     $form->addInput($lazyload);

diff --git a/includes/head.php b/includes/head.php
@@ -104,10 +104,9 @@ function registerLazyLoadImg(url, target){
     </style>
 
     <?php if($setting['serifincontent']): ?>
-    <link href="https://fonts.googleapis.com/css?family=Merriweather:400,700" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Noto+Serif+SC:400,700&amp;subset=chinese-simplified" rel="stylesheet">
     <style>div[itemprop=articleBody], .yue {
-        font-family: 'Merriweather', 'Noto Serif SC', 
+        font-family: 'Noto Serif SC', 
             -apple-system, BlinkMacSystemFont, "Segoe UI", "Droid Sans", "Helvetica Neue", "PingFang SC","Hiragino Sans GB", "Droid Sans Fallback", "Microsoft YaHei", sans-serif;}</style>
     <?php else: ?>
     <link href="https://fonts.googleapis.com/css?family=Droid+Serif:400,700" rel="stylesheet">