The quotening

Signed-off-by: Andrew Welch <andrew@nystudio107.com>
nystudio107 · Dec 5, 2017 · 1c91a39 · 1c91a39
1 parent 38e87e7
commit 1c91a39
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 52 deletions.
diff --git a/templates/404.twig b/templates/404.twig
@@ -1,11 +1,11 @@
 {# @var craft \craft\web\twig\variables\CraftVariable #}
 {% set entry = craft.entries.section("notFound").limit(1).one() %}
 
-{% extends "_layouts/_layout" %}
+{% extends "_layouts/_layout.twig" %}
 
 {% block _inline_css %}
     <style>
-        {{ source ('404_critical.min.css', ignore_missing = true) }}
+        {{ source ("404_critical.min.css", ignore_missing = true) }}
     </style>
 {% endblock %}
 

diff --git a/templates/503.twig b/templates/503.twig
@@ -1,11 +1,11 @@
 {# @var craft \craft\web\twig\variables\CraftVariable #}
 {% set entry = craft.entries.section("serviceUnavailable").limit(1).one() %}
 
-{% extends "_layouts/_layout" %}
+{% extends "_layouts/_layout.twig" %}
 
 {% block _inline_css %}
     <style>
-        {{ source ('503_critical.min.css', ignore_missing = true) }}
+        {{ source ("503_critical.min.css", ignore_missing = true) }}
     </style>
 {% endblock %}
 

diff --git a/templates/_layouts/_amp_layout.twig b/templates/_layouts/_amp_layout.twig
@@ -2,11 +2,7 @@
 {% minify %}
 {% set baseUrl = craft.app.config.general.custom.baseUrl %}
 {% set staticAssetsVersion = craft.app.config.general.custom.staticAssetsVersion %}
-{% header "Link: " ~
-"<" ~ baseUrl ~ ">; rel=dns-prefetch;" ~
-"," ~
-"<" ~ baseUrl ~ ">; rel=preconnect; crossorigin;"
-%}
+{% header "Link: <#{baseUrl}>; rel=dns-prefetch;,<#{baseUrl}>; rel=preconnect; crossorigin;" %}
 <!DOCTYPE html>
 <html ⚡ lang="{{ craft.app.language |slice(0,2) }}" class="fonts-loaded">
     <head>
@@ -15,8 +11,8 @@
         <script async custom-element="amp-sidebar" src="https://cdn.ampproject.org/v0/amp-sidebar-0.1.js"></script>
         <script async src="https://cdn.ampproject.org/v0.js"></script>
 
-        {% import '_partials/_macros.html' as macro %}
-        {% include '_partials/_global_header' %}
+        {% import "_partials/_macros.twig" as macro %}
+        {% include "_partials/_global_header.twig" %}
 
         {% block _head_links %}
         {% endblock %}
@@ -28,15 +24,15 @@
         {% block _inline_css %}
         {% endblock %}
         
-    {# -- Site fonts -- #}
-        {% include '_inlinecss/_site_fonts.css' %}
+        {# -- Site fonts -- #}
+        {% include "_inlinecss/_site_fonts.css" %}
         </style>
 
     </head>
 
     <body>
         <div id="page-container">
-            {% include '_partials/_amp_navbar' %}
+            {% include "_partials/_amp_navbar.twig" %}
 
             <main>
             {% block content %}
@@ -46,9 +42,9 @@
             {% block subcontent %}
             {% endblock %}
 
-            {% include '_partials/_amp_info_footer' %}
+            {% include "_partials/_amp_info_footer.twig" %}
 
-            {% include '_partials/_global_footer' %}
+            {% include "_partials/_global_footer.twig" %}
 
         </div>
 

diff --git a/templates/_layouts/_layout.twig b/templates/_layouts/_layout.twig
@@ -2,11 +2,7 @@
 {% minify %}
 {% set baseUrl = craft.app.config.general.custom.baseUrl %}
 {% set staticAssetsVersion = craft.app.config.general.custom.staticAssetsVersion %}
-{% header "Link: " ~
-    "<" ~ baseUrl ~ ">; rel=dns-prefetch;" ~
-    "," ~
-    "<" ~ baseUrl ~ ">; rel=preconnect; crossorigin;"
-%}
+{% header "Link: <#{baseUrl}>; rel=dns-prefetch;,<#{baseUrl}>; rel=preconnect; crossorigin;" %}
 <!DOCTYPE html>
 {% endminify %}
 <!--# if expr="$HTTP_COOKIE=/fonts\-loaded\=1/" -->
@@ -22,33 +18,33 @@
         {% block _head_links %}
         {% endblock %}
 
-        {% import '_partials/_macros.twig' as macro %}
-        {% include '_partials/_global_header' %}
+        {% import "_partials/_macros.twig" as macro %}
+        {% include "_partials/_global_header.twig" %}
 
         {# -- ServiceWorker, loadjs, and tiny-cookie -- #}
         <script>
             {% if craft.app.config.general.isSystemOn %}
-                {{ source('_inlinejs/register-service-worker.min.js') }}
+                {{ source("_inlinejs/register-service-worker.min.js") }}
             {% endif %}
-            {{ source('_inlinejs/loadjs.min.js') }}
-            {{ source('_inlinejs/tiny-cookie.min.js') }}
-            {{ source('_inlinejs/tab-handler.min.js') }}
+            {{ source("_inlinejs/loadjs.min.js") }}
+            {{ source("_inlinejs/tiny-cookie.min.js") }}
+            {{ source("_inlinejs/tab-handler.min.js") }}
         </script>
 {% endminify %}
         {# -- CRITICAL CSS -- #}
 <!--# if expr="$HTTP_COOKIE=/critical\-css\={{ staticAssetsVersion }}/" -->
-        <link rel="stylesheet" href="{{ (baseUrl ~ 'css/site.combined.min.' ~ staticAssetsVersion ~'.css') }}">
+        <link rel="stylesheet" href="{{ "#{baseUrl}css/site.combined.min.#{staticAssetsVersion}.css" }}">
 <!--# else -->
         <script>
-            Cookie.set('critical-css', {{ staticAssetsVersion }}, { expires: '7D', secure: true });
+            Cookie.set("critical-css", {{ staticAssetsVersion }}, { expires: "7D", secure: true });
         </script>
             {% block _inline_css %}
             {% endblock %}
         <link rel="preload" href="{{ baseUrl }}css/site.combined.min.{{staticAssetsVersion}}.css" as="style" onload="this.rel='stylesheet'">
         <noscript><link rel="stylesheet" href="{{ baseUrl }}css/site.combined.min.{{staticAssetsVersion}}.css"></noscript>
         <script>
-            {{ source('_inlinejs/loadCSS.min.js') }}
-            {{ source('_inlinejs/cssrelpreload.min.js') }}
+            {{ source("_inlinejs/loadCSS.min.js") }}
+            {{ source("_inlinejs/cssrelpreload.min.js") }}
         </script>
 <!--# endif -->
         {% minify %}
@@ -61,28 +57,28 @@
 
             {# -- PictureFill polyfill -- #}
             <script>
-                var testImg = document.createElement('img');
+                var testImg = document.createElement("img");
                 if (!("srcset" in testImg) || !("sizes" in testImg)) {
-                    document.createElement('picture');
-                    var s = document.createElement('script');
-                    s.setAttribute('src', '{{ baseUrl }}js/picturefill.min.{{staticAssetsVersion}}.js');
+                    document.createElement("picture");
+                    var s = document.createElement("script");
+                    s.setAttribute("src", "{{ baseUrl }}js/picturefill.min.{{staticAssetsVersion}}.js");
                     if ("async" in s)
-                        s.setAttribute('async', true);
+                        s.setAttribute("async", true);
                     document.head.appendChild(s);
                 }
             </script>
 
             {# -- Site fonts -- #}
             <style>
-                {% include '_inlinecss/_site_fonts.css' %}
+                {% include "_inlinecss/_site_fonts.css" %}
             </style>
         {% endminify %}
         {# -- FontFaceObserver -- #}
 <!--# if expr="$HTTP_COOKIE=/fonts\-loaded\=1/" -->
 <!--# else -->
         <script>
-            {{ source('_inlinejs/fontfaceobserver.min.js') }}
-            {{ source('_inlinejs/asyncload-site-fonts.min.js') }}
+            {{ source("_inlinejs/fontfaceobserver.min.js") }}
+            {{ source("_inlinejs/asyncload-site-fonts.min.js") }}
         </script>
 <!--# endif -->
         {% minify %}
@@ -104,7 +100,7 @@
     <body>
         <div id="page-container">
 
-            {% include '_partials/_info_header' %}
+            {% include "_partials/_info_header.twig" %}
 
             <main>
                 {% block content %}
@@ -115,10 +111,10 @@
             {% endblock %}
 
             {# -- Info footer -- #}
-            {% include '_partials/_info_footer' %}
+            {% include "_partials/_info_footer.twig" %}
 
             {# -- HTML Footer -- #}
-            {% include '_partials/_global_footer' %}
+            {% include "_partials/_global_footer.twig" %}
 
             {# -- Inline JS -- #}
             {% block _inline_js %}

diff --git a/templates/_partials/_amp_navbar.twig b/templates/_partials/_amp_navbar.twig
@@ -1,5 +1,5 @@
 {# @var craft \craft\web\twig\variables\CraftVariable #}
-<amp-sidebar id='sidebar1' layout='nodisplay'>
+<amp-sidebar id="sidebar1" layout="nodisplay">
     <ul class="nav-amp">
         <li></li>
         <li><a class="nav-link" href="">Blog</a></li>
@@ -9,7 +9,7 @@
     <div id="nav-menu">
         <nav>
             <div class="nav-menu">
-                <div id="nav-icon" on='tap:sidebar1.toggle' role="nav" tabindex=0>
+                <div id="nav-icon" on="tap:sidebar1.toggle" role="nav" tabindex=0>
                 </div>
             </div>
         </nav>

diff --git a/templates/_partials/_info_header.twig b/templates/_partials/_info_header.twig
@@ -6,6 +6,6 @@
         </p>
     </div>
 
-    {% include '_partials/_navbar' %}
+    {% include "_partials/_navbar.twig" %}
 
 </header>
diff --git a/templates/_partials/_macros.twig b/templates/_partials/_macros.twig
@@ -1,4 +1,4 @@
 {# @var craft \craft\web\twig\variables\CraftVariable #}
 {% macro dateFormatted(givenDate) %}
-    {{ givenDate | date('jS F Y') }}
+    {{ givenDate | date("jS F Y") }}
 {% endmacro %}
diff --git a/templates/error.twig b/templates/error.twig
@@ -1,11 +1,11 @@
 {# @var craft \craft\web\twig\variables\CraftVariable #}
 {% set entry = craft.entries.section("genericError").limit(1).one() %}
 
-{% extends "_layouts/_layout" %}
+{% extends "_layouts/_layout.twig" %}
 
 {% block _inline_css %}
     <style>
-        {{ source ('error_critical.min.css', ignore_missing = true) }}
+        {{ source ("error_critical.min.css", ignore_missing = true) }}
     </style>
 {% endblock %}
 

diff --git a/templates/index.twig b/templates/index.twig
@@ -1,9 +1,9 @@
 {# @var craft \craft\web\twig\variables\CraftVariable #}
-{% extends "_layouts/_layout" %}
+{% extends "_layouts/_layout.twig" %}
 
 {% block _inline_css %}
     <style>
-        {{ source ('index_critical.min.css', ignore_missing = true) }}
+        {{ source ("index_critical.min.css", ignore_missing = true) }}
     </style>
 {% endblock %}
 

diff --git a/templates/offline.twig b/templates/offline.twig
@@ -1,9 +1,9 @@
 {# @var craft \craft\web\twig\variables\CraftVariable #}
-{% extends "_layouts/_layout" %}
+{% extends "_layouts/_layout.twig" %}
 
 {% block _inline_css %}
     <style>
-        {{ source ('offline_critical.min.css', ignore_missing = true) }}
+        {{ source ("offline_critical.min.css", ignore_missing = true) }}
     </style>
 {% endblock %}