Skip to content

Commit

Permalink
resolved merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
jshamble committed Apr 5, 2022
2 parents 66dafaa + c9b09d0 commit bf8bd53
Show file tree
Hide file tree
Showing 44 changed files with 359 additions and 394 deletions.
1 change: 0 additions & 1 deletion amp.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ createTask('check-renovate-config', 'checkRenovateConfig');
createTask('check-sourcemaps', 'checkSourcemaps');
createTask('check-types', 'checkTypes');
createTask('check-video-interface-list', 'checkVideoInterfaceList');
createTask('cherry-pick', 'cherryPick');
createTask('clean');
createTask('codecov-upload', 'codecovUpload');
createTask('compile-jison', 'compileJison');
Expand Down
130 changes: 0 additions & 130 deletions build-system/tasks/cherry-pick.js

This file was deleted.

10 changes: 5 additions & 5 deletions examples/amp-story/amp-story-shopping.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"reviewCount": 89,
"reviewUrl": "https://www.google.com"
},
"productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
"productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
}
]
}
Expand Down Expand Up @@ -158,7 +158,7 @@
"reviewCount": 89,
"reviewUrl": "https://www.google.com"
},
"productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
"productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
},
{
"productUrl": "https://www.google.com",
Expand All @@ -173,7 +173,7 @@
"reviewCount": 89,
"reviewUrl": "https://www.google.com"
},
"productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
"productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
},
{
"productUrl": "https://www.google.com",
Expand All @@ -188,7 +188,7 @@
"reviewCount": 89,
"reviewUrl": "https://www.google.com"
},
"productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
"productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
},
{
"productUrl": "https://www.google.com",
Expand All @@ -204,7 +204,7 @@
"reviewCount": 89,
"reviewUrl": "https://www.google.com"
},
"productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
"productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
}
]
}
Expand Down
17 changes: 17 additions & 0 deletions examples/amp-story/animations-presets.html
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,23 @@ <h1>pan-up</h1>
<h1>pan-down</h1>
</amp-story-grid-layer>
</amp-story-page>

<!-- ## Pan-Right with pan-scaling-factor attr -->
<amp-story-page id="pan-right-with-static-scale">
<amp-story-grid-layer template="vertical">
<h1>pan-right</h1>
<p>with pan-scaling-factor attr</p>
<div class="img-container" style="width: 120%">
<amp-img
animate-in="pan-right" animate-in-timing-function="ease-out"
pan-scaling-factor=".9"
translate-x="35px" animate-in-duration="3.5s"
id="img-pan-right" layout="responsive" src="https://picsum.photos/720/320?image=1026"
width="720" height="320">
</amp-img>
</div>
</amp-story-grid-layer>
</amp-story-page>
</amp-story>
</body>

Expand Down
2 changes: 1 addition & 1 deletion examples/amp-story/shopping/remote.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"reviewCount": 89,
"reviewUrl": "https://www.google.com"
},
"productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
"productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto exped. Laborum ea molestias veritatis sint laudantium iusto exped."
}
]
}
14 changes: 7 additions & 7 deletions examples/amp-story/video/ecommerce.vtt
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
WEBVTT
00:00.000 --> 00:00.500
<v Lisa Wang>(Lisa Wang)
<v Lisa Wang>I'm Lisa.
<v Lisa Wang>(Lisa Wang)</v>
<v Lisa Wang>I'm Lisa.</v>

00:00.500 --> 00:02.000
<v Lisa Wang>I'm a product manager at Google.
<v Lisa Wang>I'm a product manager at Google.</v>

00:02.000 --> 00:04.500
<v Lisa Wang>And I lead our e-commerce initiatives.
<v Lisa Wang>And I lead our e-commerce initiatives.</v>

00:04.500 --> 00:05.500
<v Lisa Wang>And today I'm just going to walk
<v Lisa Wang>And today I'm just going to walk</v>

00:05.500 --> 00:07.500
<v Lisa Wang>through some of our best practices
<v Lisa Wang>through some of our best practices</v>

00:07.500 --> 00:10.000
<v Lisa Wang>for building e-commerce experiences in AMP.
<v Lisa Wang>for building e-commerce experiences in AMP.</v>
16 changes: 8 additions & 8 deletions examples/amp-story/video/gmail.vtt
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
WEBVTT
00:00.000 --> 00:01.500
<v Aakash Sahney>(Aakash Sahney)
<v Aakash Sahney>and I'm really excited to share more
<v Aakash Sahney>(Aakash Sahney)</v>
<v Aakash Sahney>and I'm really excited to share more</v>

00:01.500 --> 00:03.500
<v Aakash Sahney>about the announcement we made earlier today,
<v Aakash Sahney>about the announcement we made earlier today,</v>

00:03.500 --> 00:06.000
<v Aakash Sahney>which is like a whole new way to use AMP.
<v Aakash Sahney>which is like a whole new way to use AMP.</v>

00:06.000 --> 00:08.500
<v Aakash Sahney>We're going to talk about what's possible with AMP for email,
<v Aakash Sahney>We're going to talk about what's possible with AMP for email,</v>

00:08.500 --> 00:11.000
<v Aakash Sahney>show off some super slick demos from the three partners
<v Aakash Sahney>show off some super slick demos from the three partners</v>

00:11.000 --> 00:13.500
<v Aakash Sahney>that Paul just mentioned, and tell you a bit about how
<v Aakash Sahney>that Paul just mentioned, and tell you a bit about how</v>

00:13.500 --> 00:15.000
<v Aakash Sahney>you can get started.
<v Aakash Sahney>you can get started.</v>
28 changes: 14 additions & 14 deletions examples/amp-story/video/p1.vtt
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,33 @@ WEBVTT
NOTE Malte Ubl on AMP stories
00:00.000 --> 00:02.500
<v Malte Ubl>(Malte Ubl)
<v Malte Ubl>...and there's going to be surfacing of these stories
<v Malte Ubl>(Malte Ubl)</v>
<v Malte Ubl>...and there's going to be surfacing of these stories</v>

00:02.500 --> 00:04.000
<v Malte Ubl>(Malte Ubl)
<v Malte Ubl>in Google Search.
<v Malte Ubl>(Malte Ubl)</v>
<v Malte Ubl>in Google Search.</v>

NOTE Lisa Wang on AMP Toolbox Optimizer
00:04.500 --> 00:06.000
<v Lisa Wang>(Lisa Wang)
<v Lisa Wang>So I'm also really excited to announce today
<v Lisa Wang>(Lisa Wang)</v>
<v Lisa Wang>So I'm also really excited to announce today</v>

00:06.000 --> 00:09.000
<v Lisa Wang>(Lisa Wang)
<v Lisa Wang>that we're releasing the AMP Toolbox Optimizer, which
<v Lisa Wang>(Lisa Wang)</v>
<v Lisa Wang>that we're releasing the AMP Toolbox Optimizer, which</v>

00:09.000 --> 00:12.000
<v Lisa Wang>(Lisa Wang)
<v Lisa Wang>is basically a toolkit that developers can use to optimize...
<v Lisa Wang>(Lisa Wang)</v>
<v Lisa Wang>is basically a toolkit that developers can use to optimize...</v>

NOTE Aakash Sahney on AMP for email
00:06.000 --> 00:08.500
<v Aakash Sahney>(Aakash Sahney)
<v Aakash Sahney>So with AMP for email, users can quickly take actions on things
<v Aakash Sahney>(Aakash Sahney)</v>
<v Aakash Sahney>So with AMP for email, users can quickly take actions on things</v>

00:08.500 --> 00:11.000
<v Aakash Sahney>(Aakash Sahney)
<v Aakash Sahney>like RSVP'ing to an event.
<v Aakash Sahney>(Aakash Sahney)</v>
<v Aakash Sahney>like RSVP'ing to an event.</v>
18 changes: 9 additions & 9 deletions examples/amp-story/video/stamp.vtt
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
WEBVTT
00:00.000 --> 00:02.000
<v Jon Newmuis>(Jon Newmuis)
<v Jon Newmuis>So today, we're excited to announce the developer
<v Jon Newmuis>(Jon Newmuis)</v>
<v Jon Newmuis>So today, we're excited to announce the developer</v>

00:02.000 --> 00:06.000
<v Jon Newmuis>preview of AMP stories, an open format for visual storytelling
<v Jon Newmuis>preview of AMP stories, an open format for visual storytelling</v>

00:06.000 --> 00:09.000
<v Jon Newmuis>on mobile.
<v Jon Newmuis>on mobile.</v>

00:09.000 --> 00:12.500
<v Jon Newmuis>To demonstrate, here's a story by CNN using the format.
<v Jon Newmuis>To demonstrate, here's a story by CNN using the format.</v>

00:12.500 --> 00:16.500
<v Jon Newmuis>As you can see, it's very visual with these full bleed images.
<v Jon Newmuis>As you can see, it's very visual with these full bleed images.</v>

00:16.500 --> 00:19.000
<v Jon Newmuis>And you can also include video assets as well.
<v Jon Newmuis>And you can also include video assets as well.</v>

00:19.000 --> 00:22.000
<v Jon Newmuis>The short-form bite-sized text is more easily
<v Jon Newmuis>The short-form bite-sized text is more easily</v>

00:22.000 --> 00:24.000
<v Jon Newmuis>consumable on mobile.
<v Jon Newmuis>consumable on mobile.</v>
Loading

0 comments on commit bf8bd53

Please sign in to comment.