Fix #264

# Conflicts: # _includes/js/service-worker.js
hydecorp · Mar 28, 2021 · 3e1a265 · 3e1a265
1 parent 77d4725
commit 3e1a265
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/_includes/head/links-static.html b/_includes/head/links-static.html
@@ -6,8 +6,11 @@
 <link rel="manifest" href="{{ '/assets/site.webmanifest' | relative_url }}">
 
 {% if site.google_fonts %}
-  <link rel="dns-prefetch" href="https://fonts.googleapis.com">
-  <link rel="dns-prefetch" href="https://fonts.gstatic.com">
+  {%- capture google_fonts_url %}{{ site.google_fonts_url | default:'https://fonts.googleapis.com' }}{%- endcapture -%}
+  <link rel="dns-prefetch" href="{{ google_fonts_url }}">
+  {%- if google_fonts_url == 'https://fonts.googleapis.com' -%}
+    <link rel="dns-prefetch" href="https://fonts.gstatic.com">
+  {%- endif -%}
 {% endif %}
 
 {% if site.google_analytics %}

diff --git a/_includes/head/styles-inline.html b/_includes/head/styles-inline.html
@@ -1,7 +1,9 @@
 {% assign google_fonts = site.google_fonts %}
 {% capture style_url %}{{ 'assets/css/hydejack-9.1.2.css' | relative_url }}{% endcapture %}
 {% capture icons_url %}{{ 'assets/icomoon/style.css' | relative_url }}{% endcapture %}
-{% if google_fonts %}{% capture fonts_url %}https://fonts.googleapis.com/css?family={{ google_fonts | uri_escape }}&display=swap{% endcapture %}{% endif %}
+{% if google_fonts %}
+  {% capture fonts_url %}{{ site.google_fonts_url | default:'https://fonts.googleapis.com' }}/css?family={{ google_fonts | uri_escape }}&display=swap{% endcapture %}
+{% endif %}
 
 <link rel="preload" as="style" href="{{ style_url }}" id="_stylePreload">
 <link rel="preload" as="style" href="{{ icons_url }}" id="_iconsPreload">

diff --git a/_includes/head/styles-no-inline.html b/_includes/head/styles-no-inline.html
@@ -1,7 +1,9 @@
 {% assign google_fonts = site.google_fonts %}
 {% capture style_url %}{{ 'assets/css/hydejack-9.1.2.css' | relative_url }}{% endcapture %}
 {% capture icons_url %}{{ 'assets/icomoon/style.css' | relative_url }}{% endcapture %}
-{% if google_fonts %}{% capture fonts_url %}https://fonts.googleapis.com/css?family={{ google_fonts | uri_escape }}&display=swap{% endcapture %}{% endif %}
+{% if google_fonts %}
+  {% capture fonts_url %}{{ site.google_fonts_url | default:'https://fonts.googleapis.com' }}/css?family={{ google_fonts | uri_escape }}&display=swap{% endcapture %}
+{% endif %}
 
 <link rel="stylesheet" href="{{ style_url }}" id="_stylePreload">
 <link rel="stylesheet" href="{{ icons_url }}" id="_iconsPreload">