amp_base_theme 0.0.8 → 0.0.14

Sign up to get free protection for your applications and to get access to all the features.
Files changed (17) hide show
  1. checksums.yaml +4 -4
  2. data/_data/amp_components.yaml +7 -3
  3. data/_data/pwa_ignore.yaml +1 -0
  4. data/_data/sitemap_ignore.yaml +10 -0
  5. data/_includes/head.html +2 -1
  6. data/_includes/head/amp-components.html +15 -2
  7. data/_includes/head/amp-custom.html +0 -5
  8. data/_includes/head/google-fonts.html +6 -0
  9. data/_includes/head/seo.html +1 -1
  10. data/_layouts/amp-base.html +1 -1
  11. data/_layouts/default.html +0 -1
  12. data/assets/manifest.json +2 -3
  13. data/assets/sitemap-pages.xml +1 -1
  14. data/deploy.sh +1 -1
  15. metadata +18 -4
  16. data/_layouts/story.html +0 -6
  17. data/_layouts/website.html +0 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 73272bdcd8ab3af0ecf98ee90205e16464cadf2c80f6d69584c06e279a739af2
4
- data.tar.gz: ddad2df50cce211bd1275897e7ae3f14eaf2680f2b645213d5ed0bf160e93404
3
+ metadata.gz: f7003f50b76ef0f07d7c670961d01dc65aef73857d16a8fc5b5860e5f0d277fa
4
+ data.tar.gz: 8267a4d15531ea9256a8dbc5ec9d5fd305c72118f1dd6e33f4e9d406fd2462dd
5
5
  SHA512:
6
- metadata.gz: 3a6b4872ca20af82a900b76bfda40fda4dd4acf1c61e0ea0dc648d6557adf5e05c87b75e783ae101db7f6a813a5321b636645d7dc46db128b58d1fd89bff3154
7
- data.tar.gz: 486a13b6ac6772eb8d922c25c5185ac12c824ebdd6ade1f9675dae5cb8cda7f9e8de14389115f555d642ae09efb8a831f4e5621c13ea6d712a8b9d2b8c4700c0
6
+ metadata.gz: 3a689d53c4e4a6d654d7f8eadfff0c687e2fdf0299ed4c00c9633cbd391f95f3e1d3c4141f0881d006f84b6f55ebb3e2aa4ac4cebcc092c659fe80222ebd8f08
7
+ data.tar.gz: e807ba821cb0bf056126a6693a965fcb5383c2bbb6e33c3de3329ca89208bf74a7025726479165c140329a685523ac3adb02941e1a81df57c1570b2d3ca361b6
data/_data/amp_components.yaml CHANGED
@@ -1,4 +1,5 @@
1
1
  - name: amp-story
2
+ version: 1.0
2
3
  - name: amp-3d-gltf
3
4
  - name: amp-3q-player
4
5
  - name: amp-access-laterpay
@@ -27,6 +28,7 @@
27
28
  - name: amp-byside-content
28
29
  - name: amp-call-tracking
29
30
  - name: amp-carousel
31
+ version: 0.2
30
32
  - name: amp-connatix-player
31
33
  - name: amp-consent
32
34
  - name: amp-dailymotion
@@ -37,6 +39,7 @@
37
39
  - name: amp-dynamic-css-classes
38
40
  - name: amp-embedly-card
39
41
  - name: amp-experiment
42
+ version: 1.0
40
43
  - name: amp-facebook-comments
41
44
  - name: amp-facebook-like
42
45
  - name: amp-facebook-page
@@ -55,7 +58,6 @@
55
58
  - name: amp-ima-video
56
59
  - name: amp-image-lightbox
57
60
  - name: amp-image-slider
58
- - name: amp-img
59
61
  - name: amp-imgur
60
62
  - name: amp-inline-gallery
61
63
  - name: amp-inputmask
@@ -64,7 +66,6 @@
64
66
  - name: amp-izlesene
65
67
  - name: amp-jwplayer
66
68
  - name: amp-kaltura-player
67
- - name: amp-layout
68
69
  - name: amp-lightbox-gallery
69
70
  - name: amp-lightbox
70
71
  - name: amp-link-rewriter
@@ -76,15 +77,17 @@
76
77
  - name: amp-minute-media-player
77
78
  - name: amp-mowplayer
78
79
  - name: amp-mustache
80
+ version: 0.2
81
+ template: true
79
82
  - name: amp-nested-menu
80
83
  - name: amp-next-page
84
+ version: 1.0
81
85
  - name: amp-nexxtv-player
82
86
  - name: amp-o2-player
83
87
  - name: amp-ooyala-player
84
88
  - name: amp-orientation-observer
85
89
  - name: amp-pan-zoom
86
90
  - name: amp-pinterest
87
- - name: amp-pixel
88
91
  - name: amp-playbuzz
89
92
  - name: amp-position-observer
90
93
  - name: amp-powr-player
@@ -102,6 +105,7 @@
102
105
  - name: amp-soundcloud
103
106
  - name: amp-springboard-player
104
107
  - name: amp-sticky-ad
108
+ version: 1.0
105
109
  - name: amp-subscriptions-google
106
110
  - name: amp-subscriptions
107
111
  - name: amp-timeago
data/_data/pwa_ignore.yaml CHANGED
@@ -2,5 +2,6 @@
2
2
  - sitemap-posts.xml
3
3
  - sitemap-pages.xml
4
4
  - google-news.xml
5
+ - feed.xml
5
6
  - robots.txt
6
7
  - humans.txt
data/_data/sitemap_ignore.yaml ADDED
@@ -0,0 +1,10 @@
1
+ - sitemap.xml
2
+ - sitemap-posts.xml
3
+ - sitemap-pages.xml
4
+ - google-news.xml
5
+ - feed.xml
6
+ - robots.txt
7
+ - humans.txt
8
+ - manifest.json
9
+ - sw.html
10
+ - sw.js
data/_includes/head.html CHANGED
@@ -2,6 +2,7 @@
2
2
  {% include head/seo.html %}
3
3
  {% include head/amp-boilerplate.html %}
4
4
  {% include head/amp-custom.html %}
5
- <script async src="https://cdn.ampproject.org/v0.js"></script>
5
+ <script async src="https://cdn.ampproject.org/v0.js"></script>
6
+ {% include head/google-fonts.html %}
6
7
  {% include head/amp-components.html %}
7
8
  </head>
data/_includes/head/amp-components.html CHANGED
@@ -16,7 +16,7 @@
16
16
 
17
17
  {% endif %}
18
18
 
19
- {% if layout.amp_type == "story" %}
19
+ {% if page.amp_type == "story" %}
20
20
 
21
21
  {% if component_keys contains "amp-story" %}{% else %}
22
22
 
@@ -40,6 +40,19 @@
40
40
  {% endif %}
41
41
  {% endif %}
42
42
 
43
+ {% if site.cookie_consent %}
44
+
45
+ {% if component_keys contains "amp-analytics" %}{% else %}
46
+
47
+ {% assign consent_comp = site.data.amp_components | where: "name", "amp-consent" %}
48
+ {% assign components = components | concat: consent_comp %}
49
+ {% assign comp_name = "amp-consent" | split: "" %}
50
+ {% assign component_keys = component_keys | concat: comp_name %}
51
+
52
+ {% endif %}
53
+
54
+ {% endif %}
55
+
43
56
  {% if site.pwa %}
44
57
  {% if component_keys contains "amp-install-serviceworker" %}{% else %}
45
58
 
@@ -53,6 +66,6 @@
53
66
 
54
67
  {% for comp in components %}
55
68
 
56
- <script async custom-element="{{ comp.name }}" src="https://cdn.ampproject.org/v0/{{ comp.name }}-{{ comp.version | default: "0.1" }}.js"></script>
69
+ <script async custom-{% if comp.template %}template{% else %}element{% endif %}="{{ comp.name }}" src="https://cdn.ampproject.org/v0/{{ comp.name }}-{{ comp.version | default: "0.1" }}.js"></script>
57
70
 
58
71
  {% endfor %}
data/_includes/head/amp-custom.html CHANGED
@@ -1,9 +1,4 @@
1
- {% if site.google_fonts %}
2
1
 
3
- {% assign family_param = site.google_fonts | join: "|" | replace: " ", "+" %}
4
- <link href="https://fonts.googleapis.com/css?family={{ family_param }}" rel="stylesheet">
5
-
6
- {% endif %}
7
2
 
8
3
  <style amp-custom>
9
4
 
data/_includes/head/google-fonts.html ADDED
@@ -0,0 +1,6 @@
1
+ {% if site.google_fonts %}
2
+
3
+ {% assign family_param = site.google_fonts | join: "|" | replace: " ", "+" %}
4
+ <link href="https://fonts.googleapis.com/css?family={{ family_param }}" rel="stylesheet">
5
+
6
+ {% endif %}
data/_includes/head/seo.html CHANGED
@@ -2,7 +2,7 @@
2
2
  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
3
3
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
4
4
 
5
- <title>{{ page.title | default: site.title }}</title>
5
+ <title>{{ site.title }} | {{ page.title }}</title>
6
6
 
7
7
  <link rel="canonical" href="{{ site.url }}{{ site.baseurl }}{{ page.url }}" />
8
8
  <link rel="manifest" href="{{ site.baseurl }}/manifest.json">
data/_layouts/amp-base.html CHANGED
@@ -7,7 +7,7 @@ layout: compress
7
7
  {% include head.html %}
8
8
 
9
9
  <body>
10
- {% if layout.amp_type =="story" %}
10
+ {% if page.amp_type =="story" %}
11
11
  {% include amp-story/body.html %}
12
12
  {% else %}
13
13
  {{ content }}
data/_layouts/default.html CHANGED
@@ -1,6 +1,5 @@
1
1
  ---
2
2
  layout: amp-base
3
- amp_type: 'website'
4
3
  ---
5
4
 
6
5
  {{ content }}
data/assets/manifest.json CHANGED
@@ -65,6 +65,5 @@ permalink: "manifest.json"
65
65
  {
66
66
  "platform": "Web"
67
67
  }
68
- ],
69
- }
70
- }
68
+ ]
69
+ }
data/assets/sitemap-pages.xml CHANGED
@@ -7,7 +7,7 @@ permalink: "sitemap-pages.xml"
7
7
  <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">
8
8
  {% assign documents = site.pages %}
9
9
  {% for p in documents %}
10
- {% if p.output == false and p.path contains "assets" %}
10
+ {% if p.output == false or p.path contains "assets" %}
11
11
  {% else %}
12
12
  {% assign u = p.url %}{% assign usize = u | size | minus: 1 %}
13
13
  {% 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 CHANGED
@@ -1 +1 @@
1
- gem build amp_base_theme && sudo gem install amp_base_theme-0.0.8.gem && gem contents amp_base_theme --version "=0.0.8" && gem push amp_base_theme-0.0.8.gem
1
+ gem build amp_base_theme && sudo gem install amp_base_theme-0.0.14.gem && gem contents amp_base_theme --version "=0.0.14" && gem push amp_base_theme-0.0.14.gem
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: amp_base_theme
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.8
4
+ version: 0.0.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Lukas Himsel
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-08-01 00:00:00.000000000 Z
11
+ date: 2020-10-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jekyll
@@ -24,6 +24,20 @@ dependencies:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '4.1'
27
+ - !ruby/object:Gem::Dependency
28
+ name: jekyll-data
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - "~>"
32
+ - !ruby/object:Gem::Version
33
+ version: '1.1'
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - "~>"
39
+ - !ruby/object:Gem::Version
40
+ version: '1.1'
27
41
  - !ruby/object:Gem::Dependency
28
42
  name: bundler
29
43
  requirement: !ruby/object:Gem::Requirement
@@ -51,6 +65,7 @@ files:
51
65
  - README.md
52
66
  - _data/amp_components.yaml
53
67
  - _data/pwa_ignore.yaml
68
+ - _data/sitemap_ignore.yaml
54
69
  - _includes/amp-story/body.html
55
70
  - _includes/analytics/cookie-consent.html
56
71
  - _includes/analytics/facebook-analytics.html
@@ -60,14 +75,13 @@ files:
60
75
  - _includes/head/amp-boilerplate.html
61
76
  - _includes/head/amp-components.html
62
77
  - _includes/head/amp-custom.html
78
+ - _includes/head/google-fonts.html
63
79
  - _includes/head/seo.html
64
80
  - _includes/head/structured-data.html
65
81
  - _includes/pwa/sw.html
66
82
  - _layouts/amp-base.html
67
83
  - _layouts/compress.html
68
84
  - _layouts/default.html
69
- - _layouts/story.html
70
- - _layouts/website.html
71
85
  - assets/_headers
72
86
  - assets/feed.xml
73
87
  - assets/google-news.xml
data/_layouts/story.html DELETED
@@ -1,6 +0,0 @@
1
- ---
2
- layout: amp-base
3
- amp_type: 'story'
4
- ---
5
-
6
- {{ content }}
data/_layouts/website.html DELETED
@@ -1,6 +0,0 @@
1
- ---
2
- layout: amp-base
3
- amp_type: 'website'
4
- ---
5
-
6
- {{ content }}