Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/as-ideas/oil into #191-oi…
Browse files Browse the repository at this point in the history
…l-shown
  • Loading branch information
Awerkow-Schäfer, Dmitri committed Aug 16, 2018
2 parents d49d23e + 72bfdba commit d185273
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion etc/appConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module.exports = {
}, {
filename: 'demos/amp-consent-iframe.html',
template: path.resolve(sourcePath, 'demos', 'amp-consent-iframe.html'),
chunks: ['oil'],
chunks: ['oilstub','oil'],
inject: 'head'
}, {
filename: 'demos/advanced-settings.html',
Expand Down
2 changes: 1 addition & 1 deletion src/demos/amp-consent.html
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
</script>
<div class="lightbox"
id="consentDialog">

<!--ToDO: change src to live environment-->
<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">
Expand Down
2 changes: 1 addition & 1 deletion src/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -282,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">Find everything you need on <a href="https://www.oiljs.org">oiiljs.org!</a></h2>
<h2 class="logo-claim-2">Find everything you need on <a href="https://www.oiljs.org">oiljs.org</a>!</h2>
</div>

<div class="jumbotron hero">
Expand Down

0 comments on commit d185273

Please sign in to comment.