amp_base_theme 0.0.6 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc001805b5bb18e645aff10343360543e4a58e4b927058780e5387fa2853213d
-  data.tar.gz: 9fb5566b8441d53c4b1ca3c8b1cf33223bd896b11d82dd2dd9c076a72763f233
+  metadata.gz: 125416c80d01d563546707a646eaa079258fc2a3bac3d57e9237f13314096e24
+  data.tar.gz: 9cb52b71a61331412de33275103ea5aee78345a0483f2403baf58e2ce8ad03d3
 SHA512:
-  metadata.gz: 664798a70a22ceedcfdf3cbdd42c3fc701bc5c54875d85df87251358209b6caee4260de8d54dfeb34a6b5d996bc261e67841c2d7842c16070b7bae329eebd3e2
-  data.tar.gz: e3c6a7e9e9770bb8eeaea3c36d26cf254add1bc924b0f9a29057afa4bdc3e0c7ea6d46da57f3ea1ab82ed279a9a78261e5d0d307b8e0736bf8f1484b03de4853
+  metadata.gz: be2797ed962fefbf71e8b86dd03766bc7b04cbecde4cfafa0c86509f1d37c0b26b483c5b76ace556f033751cbc8dec23086198373fca2ceab1d4c3877bcb0ba5
+  data.tar.gz: 1ca8c7a6fef240b908a9c15277b0d729cfbee57987ebbaff6c20404949141902df784b0f438170eb0894436013796a5a36eb84eeab87bdd90a9aabec5b37f476

data/_data/amp_components.yaml

@@ -1,4 +1,5 @@
 - name: amp-story
+  version: 1.0
 - name: amp-3d-gltf
 - name: amp-3q-player
 - name: amp-access-laterpay

data/_data/pwa_ignore.yaml

@@ -2,5 +2,6 @@
 - sitemap-posts.xml
 - sitemap-pages.xml
 - google-news.xml
+- feed.xml
 - robots.txt
 - humans.txt

data/_includes/head.html

@@ -2,6 +2,7 @@
     {% include head/seo.html %}
     {% include head/amp-boilerplate.html %}
     {% include head/amp-custom.html %}
-    <script async src="https://cdn.ampproject.org/v0.js"></script>    
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    {% include head/google-fonts.html %}
     {% include head/amp-components.html %}
 </head>

data/_includes/head/amp-components.html

@@ -40,6 +40,19 @@
     {% endif %}
 {% endif %}
 
+{% if site.cookie_consent %}
+
+    {% if component_keys contains "amp-analytics" %}{% else %}
+
+        {% assign consent_comp = site.data.amp_components | where: "name", "amp-consent" %}
+        {% assign components = components | concat: consent_comp %}
+        {% assign comp_name = "amp-consent" | split: "" %}
+        {% assign component_keys = component_keys | concat: comp_name %}
+
+    {% endif %}
+
+{% endif %}
+
 {% if site.pwa %}
     {% if component_keys contains "amp-install-serviceworker" %}{% else %}
 

data/_includes/head/amp-custom.html

@@ -1,9 +1,4 @@
-{% if site.google_fonts %}
 
-    {% assign family_param = site.google_fonts | join: "|"" | replace: " ", "+" %}
-    <link href="https://fonts.googleapis.com/css?family={{ family_param }}" rel="stylesheet">
-
-{% endif %}
 
 <style amp-custom>
     

data/_includes/head/google-fonts.html

@@ -0,0 +1,6 @@
+{% if site.google_fonts %}
+
+    {% assign family_param = site.google_fonts | join: "|" | replace: " ", "+" %}
+    <link href="https://fonts.googleapis.com/css?family={{ family_param }}" rel="stylesheet">
+
+{% endif %}

data/_layouts/default.html

@@ -1,6 +1,5 @@
 ---
 layout: amp-base
-amp_type: 'website'
 ---
 
 {{ content }}

data/assets/manifest.json

@@ -66,5 +66,4 @@ permalink: "manifest.json"
             "platform": "Web"
         }
     ],
-    }
 }

data/assets/sitemap-pages.xml

@@ -7,7 +7,7 @@ permalink: "sitemap-pages.xml"
 <urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 {% assign documents = site.pages %}
 {% for p in documents %}
-{% if p.output == false and p.path contains "assets" %}
+{% if p.output == false or p.path contains "assets" %}
 {% else %}
 {% assign u = p.url %}{% assign usize = u | size | minus: 1 %}
 {% assign u =  u | slice: usize %}{% if u != '/' and u != 'l' and usize <= 1 %}{% assign x = p.url | append: '.html' %}{% else %}{% assign x = p.url %}{% endif %}

data/deploy.sh

@@ -0,0 +1 @@
+gem build amp_base_theme && sudo gem install amp_base_theme-0.0.12.gem && gem contents amp_base_theme --version "=0.0.12" && gem push amp_base_theme-0.0.12.gem

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amp_base_theme
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.12
 platform: ruby
 authors:
 - Lukas Himsel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-01 00:00:00.000000000 Z
+date: 2020-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: jekyll-data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -60,14 +74,13 @@ files:
 - _includes/head/amp-boilerplate.html
 - _includes/head/amp-components.html
 - _includes/head/amp-custom.html
+- _includes/head/google-fonts.html
 - _includes/head/seo.html
 - _includes/head/structured-data.html
 - _includes/pwa/sw.html
 - _layouts/amp-base.html
 - _layouts/compress.html
 - _layouts/default.html
-- _layouts/story.html
-- _layouts/website.html
 - assets/_headers
 - assets/feed.xml
 - assets/google-news.xml
@@ -79,6 +92,7 @@ files:
 - assets/sitemap.xml
 - assets/sw.html
 - assets/sw.js
+- deploy.sh
 homepage: https://github.com/lukas-h/amp_base_theme
 licenses:
 - MIT

data/_layouts/story.html

@@ -1,4 +0,0 @@
----
-layout: amp-base
-amp_type: 'story'
----

data/_layouts/website.html

@@ -1,6 +0,0 @@
----
-layout: amp-base
-amp_type: 'website'
----
-
-{{ content }}