Skip to content

Commit

Permalink
Merge pull request #878 from adobecom/stage
Browse files Browse the repository at this point in the history
Unity Bugs Fixes
  • Loading branch information
Blainegunn authored Oct 28, 2024
2 parents b85b2ee + 11743c0 commit d4d1f12
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 31 deletions.
44 changes: 16 additions & 28 deletions acrobat/blocks/verb-widget/verb-widget.css
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,21 @@
margin-left: 15px;
}

.verb-mobile-cta {
display: flex;
top: 324px;
left: 40px;
padding: 11px 25px;
border-radius: 47px;
background: #1473e6;
color: white;
white-space: nowrap;
font-weight: 700;
justify-content: center;
align-items: center;
width: 30%;
}

.verb-mobile-cta:hover,
.verb-mobile-cta:active {
background-color: #0054b6;
Expand All @@ -263,20 +278,8 @@
flex: 1 1 55%;
flex-direction: row;
padding: 48px 0 48px 48px;
/* cursor: pointer; */
}

.verb-mobile-cta {
background: #1473e6;
border-radius: 8px;
padding: 11px 27px;
color: #fff;
white-space: nowrap;
font-weight: 700;
display: flex;
justify-content: center;
align-items: center;
width: 30%;
/* cursor: pointer; */
}
}

Expand Down Expand Up @@ -315,19 +318,4 @@
.verb-cta {
cursor: pointer;
}

.verb-mobile-cta {
display: flex;
top: 324px;
left: 40px;
padding: 11px 25px;
border-radius: 47px;
background: #1473e6;
color: white;
white-space: nowrap;
font-weight: 700;
justify-content: center;
align-items: center;
width: 30%;
}
}
10 changes: 9 additions & 1 deletion acrobat/blocks/verb-widget/verb-widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ export default async function init(element) {
return;
}

const ENV = getEnv();
const { locale } = getConfig();
const ppURL = window.mph['verb-widget-privacy-policy-url'] || `https://www.adobe.com${locale.prefix}/privacy/policy.html`;
const touURL = window.mph['verb-widget-terms-of-use-url'] || `https://www.adobe.com${locale.prefix}/legal/terms.html`;
Expand Down Expand Up @@ -270,6 +269,15 @@ export default async function init(element) {
}
});

window.addEventListener('beforeunload', () => {
const date = new Date();
date.setTime(date.getTime() + 1 * 60 * 1000);
const cookieExp = `expires=${date.toUTCString()}`;
if (exitFlag) {
document.cookie = `UTS_Redirect=${Date.now()};domain=.adobe.com;path=/;expires=${cookieExp}`;
}
});

// Errors, Analytics & Logging
const lanaOptions = {
sampleRate: 1,
Expand Down
5 changes: 4 additions & 1 deletion acrobat/scripts/contentSecurityPolicy/prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const connectSrc = [
'adobeioruntime.net',
'adobesearch.adobe.io',
'analytics.tiktok.com',
'api.company-target.com/api/v2/',
'api.company-target.com/',
'api.iperceptions.com',
'bat.bing.com/',
'c.go-mpulse.net',
Expand All @@ -50,6 +50,8 @@ const connectSrc = [
'px.ads.linkedin.com',
'tr6.snapchat.com',
'ad.doubleclick.net',
'main--unity--adobecom.hlx.live',
'main--unity--adobecom.hlx.page',
';',
];

Expand Down Expand Up @@ -243,6 +245,7 @@ const scriptSrc = [
'yjtag.yahoo.co.jp',
'rum.hlx.page',
'tr.snapchat.com',
'api.demandbase.com/api/v3',
';',
];

Expand Down
15 changes: 14 additions & 1 deletion edgeworkers/Acrobat_DC_web_prod/utils/csp/prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const connectSrc = [
'adobeioruntime.net',
'adobesearch.adobe.io',
'analytics.tiktok.com',
'api.company-target.com/api/v2/',
'api.company-target.com/',
'api.iperceptions.com',
'bat.bing.com/',
'c.go-mpulse.net',
Expand All @@ -46,6 +46,18 @@ const connectSrc = [
'trial-eum-clienttons-s.akamaihd.net/',
'*.akstat.io/',
'rum.hlx.page',
'rum.hlx.page',
'facebook.com',
'px.ads.linkedin.com',
'tr6.snapchat.com',
'ad.doubleclick.net',
'rum.hlx.page',
'facebook.com',
'px.ads.linkedin.com',
'tr6.snapchat.com',
'ad.doubleclick.net',
'main--unity--adobecom.hlx.live',
'main--unity--adobecom.hlx.page',
';',
];

Expand Down Expand Up @@ -237,6 +249,7 @@ const scriptSrc = [
's.yimg.jp',
'yjtag.yahoo.co.jp',
'rum.hlx.page',
'api.demandbase.com/api/v3',
';',
];

Expand Down

0 comments on commit d4d1f12

Please sign in to comment.