Optimization: Removed built-in Lato font. #249

iissnan · Jun 26, 2015 · e0809f1 · e0809f1
1 parent 5e108e0
commit e0809f1
Show file tree

Hide file tree

Showing 16 changed files with 9 additions and 46 deletions.
diff --git a/_config.yml b/_config.yml
@@ -57,6 +57,11 @@ scroll_to_more: true
 toc_list_number: true
 
 
+# Use Lato font
+# Note: this option is avialable only when the language is not `zh-Hans`
+use_font_lato: true
+
+
 ## DO NOT EDIT THE FOLLOWING SETTINGS
 ## UNLESS YOU KNOW WHAT YOU ARE DOING
 

diff --git a/layout/_partials/head.swig b/layout/_partials/head.swig
@@ -18,6 +18,10 @@
   <link rel="stylesheet" type="text/css" href="{{ url_for(theme.vendors) }}/fancybox/source/jquery.fancybox.css?v=2.1.5"/>
 {% endif %}
 
+{% if config.language !== 'zh-Hans' and theme.use_font_lato %}
+  <link href='http://fonts.googleapis.com/css?family=Lato:300,400,700,400italic&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
+{% endif %}
+
 <link rel="stylesheet" type="text/css" href="{{ url_for(theme.css) }}/main.css?v={{ theme.version }}"/>
 
 {% if config.description %}

diff --git a/source/css/_common/_fonts/lato.styl b/source/css/_common/_fonts/lato.styl
diff --git a/source/css/main.styl b/source/css/main.styl
@@ -37,7 +37,6 @@ for $mixin in $mixins
 
 
 // Fonts
-@import "_common/_fonts/lato";
 @import "_common/_fonts/icon-font";
 @import "_common/_fonts/icon-" + hexo-config('icon_font');
 

diff --git a/source/fonts/lato/Lato-Bold.eot b/source/fonts/lato/Lato-Bold.eot
diff --git a/source/fonts/lato/Lato-Bold.ttf b/source/fonts/lato/Lato-Bold.ttf
diff --git a/source/fonts/lato/Lato-Bold.woff b/source/fonts/lato/Lato-Bold.woff
diff --git a/source/fonts/lato/Lato-BoldItalic.eot b/source/fonts/lato/Lato-BoldItalic.eot
diff --git a/source/fonts/lato/Lato-BoldItalic.ttf b/source/fonts/lato/Lato-BoldItalic.ttf
diff --git a/source/fonts/lato/Lato-BoldItalic.woff b/source/fonts/lato/Lato-BoldItalic.woff
diff --git a/source/fonts/lato/Lato-Italic.eot b/source/fonts/lato/Lato-Italic.eot
diff --git a/source/fonts/lato/Lato-Italic.ttf b/source/fonts/lato/Lato-Italic.ttf
diff --git a/source/fonts/lato/Lato-Italic.woff b/source/fonts/lato/Lato-Italic.woff
diff --git a/source/fonts/lato/Lato-Regular.eot b/source/fonts/lato/Lato-Regular.eot
diff --git a/source/fonts/lato/Lato-Regular.ttf b/source/fonts/lato/Lato-Regular.ttf
diff --git a/source/fonts/lato/Lato-Regular.woff b/source/fonts/lato/Lato-Regular.woff