default.liquid in jekyll-theme-amp-0.1.1

- old
+ new

@@ -14,10 +14,14 @@
 
 {%- assign schema_date = page.date | default: site.time | date_to_xmlschema -%}
 {%- assign schema_modi = site.time | date_to_xmlschema -%}
 {%- assign schema_curl = page.url  | absolute_url | xml_escape -%}
 
+{%- capture site_scss -%}
+    @import "jekyll-theme-amp.scss";
+    {% include assets/custom.scss %} {{ site.scss }}
+{%- endcapture -%}
 
 <!doctype html>
 <html amp lang="{{ lang }}">
 
 <head>
@@ -37,20 +41,23 @@
     <meta property="og:url" content="{{ schema_curl }}">
     <meta property="og:type" content="article">
     <meta property="article:author" content="{{ author }}">
     <meta property="article:published_time" content="{{ schema_date }}">
     <meta property="article:modified_time" content="{{ schema_modi }}">
+    <!-- meta-custom -->
+    {% for meta in site.meta -%}
+        <meta name="{{ meta.first }}" content="{{ meta.last }}">
+    {% endfor -%}
     <!-- link -->
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Noto+Serif+SC&display=swap">
     <link rel="canonical" href="{{ schema_curl }}">
     <link rel="icon" type="image/svg+xml" href="{{ site.baseurl }}/assets/favicon.svg">
     <!-- style -->
     <style amp-boilerplate>{{ "@import 'amp.scss'" | scssify | strip_newlines }}</style>
     <noscript>
         <style amp-boilerplate>{{ "@import 'amp.noscript.scss'" | scssify | strip_newlines }}</style>
     </noscript>
-    <style amp-custom>{{ "@import 'custom.scss'" | scssify | strip_newlines | replace: " !important", "" }}</style>
+    <style amp-custom>{{ site_scss | scssify | strip_newlines | replace: " !important", "" }}</style>
     <!-- script -->
     <script type="application/ld+json">
         {
             "@context": "https://schema.org",
             "@type": "Article",
@@ -73,11 +80,11 @@
             "publisher": {
                 "@type": "Organization",
                 "name": "{{ site.title }}",
                 "logo": {
                     "@type": "ImageObject",
-                    "url": "{{ 'assets/schema.600x60.png' | absolute_url | xml_escape }}"
+                    "url": "{{ site.logo | default: 'assets/schema.600x60.png' | absolute_url | xml_escape }}"
                 }
             },
             "description": "{{ description }}"
         }
     </script>
@@ -86,8 +93,9 @@
 
 <body>
     <main class="container">
         <article class="markdown-body">{{ content }}</article>
     </main>
+    <script>{% include assets/custom.js %} {{ site.script }}</script>
 </body>
 
 </html>