diff --git a/lib/js/webfont.js b/lib/js/webfont.js new file mode 100644 index 0000000..e1e9785 --- /dev/null +++ b/lib/js/webfont.js @@ -0,0 +1,45 @@ +/* + * Copyright 2015 Small Batch, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +/* Web Font Loader v1.5.18 - (c) Adobe Systems, Google. License: Apache 2.0 */ +;(function(window,document,undefined){function aa(a,b,c){return a.call.apply(a.bind,arguments)}function ba(a,b,c){if(!a)throw Error();if(2a.c||this.c===a.c&&this.g>a.g||this.c===a.c&&this.g===a.g&&this.D>a.D?1:this.cd.c||536==d.c&&11>d.g))} +function E(a,b,c){return(a=a.match(b))&&a[c]?a[c]:""};function G(a){this.ma=a||"-"}G.prototype.e=function(a){for(var b=[],c=0;c=a.X?a.k.ga&&R(a,b,c)&&(null===a.ca||a.ca.hasOwnProperty(a.m.getName()))?S(a,a.$):S(a,a.ka):ja(a):S(a,a.$)}function ja(a){setTimeout(k(function(){Q(this)},a),50)}function S(a,b){a.t.remove();a.u.remove();a.H.remove();b(a.m)};function T(a,b,c,d){this.d=b;this.A=c;this.S=0;this.ea=this.ba=!1;this.X=d;this.k=a.k}function ka(a,b,c,d,e){c=c||{};if(0===b.length&&e)J(a.A);else for(a.S+=b.length,e&&(a.ba=e),e=0;e + + diff --git a/src/include/_head.html b/src/include/_head.html index d0b301c..cdf4825 100644 --- a/src/include/_head.html +++ b/src/include/_head.html @@ -13,4 +13,5 @@ + diff --git a/src/scss/_structure.scss b/src/scss/_structure.scss index fcf660b..47b774f 100644 --- a/src/scss/_structure.scss +++ b/src/scss/_structure.scss @@ -11,9 +11,14 @@ body { margin: 0; height: 100%; color: $color_secondary; - font-family: $font_default; font-weight: 400; } +html.wf-inactive body { + font-family: $font_local; +} +html.wf-active body { + font-family: $font_default; +} h1, h2, h3, h4, h5, h6 { font-weight: 700; diff --git a/src/scss/style.scss b/src/scss/style.scss index 3ecf295..f7a2dcc 100644 --- a/src/scss/style.scss +++ b/src/scss/style.scss @@ -21,7 +21,8 @@ $color_link_hover: #62bbe7; $color_footer_heading: #ffffff; $color_footer_content: #bfc9d3; $color_navbar_bg: #d3d3d3; -$font_default: 'Lato', 'Heiti SC', 'Hiragino Sans GB', 'STHeiti', 'Source Han Sans CN', 'WenQuanYi Zen Hei', 'WenQuanYi Micro Hei', '微软雅黑', sans-serif ; +$font_default: 'Lato', 'Heiti SC', 'Hiragino Sans GB', 'STHeiti', 'Source Han Sans CN', 'WenQuanYi Zen Hei', 'WenQuanYi Micro Hei', '微软雅黑', sans-serif; +$font_local: 'Heiti SC', 'Hiragino Sans GB', 'STHeiti', 'Source Han Sans CN', 'WenQuanYi Zen Hei', 'WenQuanYi Micro Hei', '微软雅黑', sans-serif; @import "Lato"; @import "structure"; @@ -88,7 +89,7 @@ $font_default: 'Lato', 'Heiti SC', 'Hiragino Sans GB', 'STHeiti', 'Source Han Sa } #news { li > a { - color: #384452 + color: $color_secondary; } } }