Oil 198 ampdemo #197
Merged
Oil 198 ampdemo #197
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # etc/appConfig.js # src/demos/amp-consent-iframe.html # src/demos/amp-consent.html
Pull Request Test Coverage Report for Build 669
💛 - Coveralls |
ltparis2018
suggested changes
Aug 16, 2018
etc/appConfig.js
Outdated
| @@ -31,7 +31,8 @@ module.exports = { | |||
| }, { | |||
| filename: 'demos/amp-consent-iframe.html', | |||
| template: path.resolve(sourcePath, 'demos', 'amp-consent-iframe.html'), | |||
| chunks: [] | |||
| chunks: ['oil'], | |||
There was a problem hiding this comment.
I'd like to have the stub here too. I know, it's not really necessary. But with it nobody has to ask why it is missing. And it's only a word more :)
src/demos/amp-consent.html
Outdated
| src="https://oil.axelspringer.com/demos/direct-integration.html"> | ||
| <amp-iframe class="lightbox-content" layout="fill" | ||
| sandbox="allow-scripts allow-same-origin allow-popups allow-popups-to-escape-sandbox" | ||
| src="https://oil-integration-host1.herokuapp.com/demos/amp-consent-iframe.html"> |
There was a problem hiding this comment.
Yes, at the moment it's the only possible way. But we should it change to oil.axelspringer.com as soon as it is deployed. Demo page are on production stage - and we don't want any reference to our integration stage on production.
| height=250 | ||
| type="appnexus" | ||
| data-member="7823" | ||
| data-code="dieser-ferdinand.de-amp-ressort_story-mrec" |
There was a problem hiding this comment.
Is this correct? A reference to "dieser-ferdinand"?
src/public/index.html
Outdated
| @@ -280,7 +282,7 @@ | |||
|
|
|||
| <div class="claim-wrapper"> | |||
| <h1 class="logo-claim">This is not the real website of OIL.js</h1> | |||
| <h2 class="logo-claim-2"><a href="https://www.oiljs.org">On oiljs.org you will find everything you need.</a></h2> | |||
| <h2 class="logo-claim-2">Find everything you need on <a href="https://www.oiljs.org">oiiljs.org!</a></h2> | |||
There was a problem hiding this comment.
oiljs.org! Not oiiljs.org.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.