From abadcd5ede164296c48d8662aa7595797904bd8e Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sat, 2 May 2020 06:36:45 +0000 Subject: [PATCH] remove googlefonts and use plain CSS instead --- README.md | 1 - _includes/head.html | 14 +------------- _layouts/base.html | 5 ++--- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 8e1ec5e..5257ad5 100644 --- a/README.md +++ b/README.md @@ -160,7 +160,6 @@ js | List of local JavaScript files to include in the page (eg. `/asset ext-js | List of external JavaScript files to include in the page (eg. `//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.2/underscore-min.js`). External JavaScript files that support [Subresource Integrity (SRI)](https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity) can be specified using the `href` and `sri` parameters eg.
`href: "//code.jquery.com/jquery-3.1.1.min.js"`
`sri: "sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8="` css | List of local CSS files to include in the page ext-css | List of external CSS files to include in the page. External CSS files using SRI (see `ext-js` parameter) are also supported. -googlefonts | List of Google fonts to include in the page (eg. `["Monoton", "Lobster"]`) ### Page types diff --git a/_includes/head.html b/_includes/head.html index 22b4031..e9a44bb 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -30,12 +30,6 @@ {% endfor %} {% endif %} - {% if layout.common-googlefonts %} - {% for font in layout.common-googlefonts %} - - {% endfor %} - {% endif %} - {% if page.ext-css %} {% for css in page.ext-css %} {% include ext-css.html css=css %} @@ -48,13 +42,7 @@ {% endfor %} {% endif %} - {% if page.googlefonts %} - {% for font in page.googlefonts %} - - {% endfor %} - {% endif %} - - + {% if site.fb_app_id %} {% endif %} diff --git a/_layouts/base.html b/_layouts/base.html index 147f91d..a9cd442 100644 --- a/_layouts/base.html +++ b/_layouts/base.html @@ -6,9 +6,8 @@ common-ext-css: - href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" sri: "sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" - "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/all.min.css" -common-googlefonts: - - "Lora:400,700,400italic,700italic" - - "Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" + - "https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic" + - "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" common-ext-js: - href: "https://code.jquery.com/jquery-3.4.1.min.js" sri: "sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo="