Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
26 changes: 13 additions & 13 deletions demo/helpers/accounts.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
// prettier-ignore
const accounts = [
// US
'DEV00000000NI',
'DEV0000000NIQ',
'DEV000NINONUS',
'DEV00NINONUSQ',
// 'DEV00000000NI',
// 'DEV0000000NIQ',
// 'DEV000NINONUS',
// 'DEV00NINONUSQ',
// pay later short term
'DEV0000000GPL',
'DEV00000GPLNQ',
'DEV000000GPLQ',
// pay later long term
// 'DEV0USGENERIC',
// 'DEV00USLTNQEZ',
// 'DEV00USLTNQGZ',
// 'DEV00USLTMQEZ',
// 'DEVUSLTMQEZRB',
// 'DEV00USLTMQGZ',
// 'DEV00USLTSQEZ',
// 'DEVUSLTSQEZRB',
// 'DEV00USLTSQGZ',
'DEV0USGENERIC',
'DEV00USLTNQEZ',
'DEV00USLTNQGZ',
'DEV00USLTMQEZ',
'DEVUSLTMQEZRB',
'DEV00USLTMQGZ',
'DEV00USLTSQEZ',
'DEVUSLTSQEZRB',
'DEV00USLTSQGZ',


// US Buttons Messages
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@paypal/common-components": "^1.0.33",
"@paypal/sdk-client": "^4.0.166",
"@paypal/sdk-constants": "^1.0.118",
"@paypal/sdk-logos": "^2.0.0"
"@paypal/sdk-logos": "^2.3.4"
},
"devDependencies": {
"@axe-core/playwright": "^4.10.1",
Expand Down
22 changes: 9 additions & 13 deletions src/server/locale/AU/mutations/gpl.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const flex = [
[
'default',
{
logo: Logo.PP_PAYPAL.WHITE,
logo: Logo.WORDMARK.WHITE,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is the logo WORDMARK from the sdk team? As I know we using the term BADGE for v6. I wonder if that apply for v5

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah it comes from the sdk logos package. the actual logo names a user passes through are the same as usual - primary, alternative, inline, none. this just changes the underlying logo to match.

headline: [
{
tag: 'xsmall'
Expand Down Expand Up @@ -45,11 +45,11 @@ export default {
styles: [
textWrap(textSize * 40.5, textSize, 'AU'),
xSmallFallback(textSize * 21),
messageLogoWidth(false, textSize * 4, textSize * 1.25),
messageLogoWidth(false, textSize * 5.1),
setLogoTop(textSize * 20),
addPeriod()
],
logo: Logo.PP_PAYPAL.COLOR,
logo: Logo.WORDMARK.BLACK,
headline: [
{
tag: 'medium',
Expand All @@ -66,19 +66,15 @@ export default {
styles: [
xSmallFallback(textSize * 16),
setLogoTop(textSize * 41.5),
messageLogoWidth(textSize * 6, textSize * 4, textSize * 1.25),
messageLogoWidth(textSize * 6, textSize * 5.1),
addPeriod()
]
})
],
[
'logo.type:primary && logo.position:top',
({ textSize }) => ({
styles: [
xSmallFallback(textSize * 16),
messageLogoWidth(textSize * 6, textSize * 4, textSize * 1.25),
addPeriod()
]
styles: [xSmallFallback(textSize * 16), messageLogoWidth(textSize * 6, textSize * 5.1), addPeriod()]
})
],
[
Expand All @@ -89,10 +85,10 @@ export default {
textWrap(textSize * 36.5, textSize, 'AU'),
xSmallFallback(textSize * 16),
altNoWrap(textSize * 10.6),
messageLogoWidth(textSize * 1.75, textSize * 4, textSize * 1.25),
messageLogoWidth(textSize * 1.75, textSize * 1.35),
addPeriod()
],
logo: Logo.PP_PAYPAL.COLOR[0]
logo: Logo.PP_MONOGRAM.COLOR
})
],
[
Expand Down Expand Up @@ -120,8 +116,8 @@ export default {
[
'logo.type:inline',
({ textSize }) => ({
styles: [xSmallFallback(textSize * 18), `.message__logo { width: ${textSize * 4}px }`],
logo: Logo.NO_PP_MONOGRAM.COLOR,
styles: [xSmallFallback(textSize * 18), `.message__logo { width: ${textSize * 3.5}px }`],
logo: Logo.WORDMARK.BLACK,
headline: [
{
tag: 'medium.2',
Expand Down
18 changes: 9 additions & 9 deletions src/server/locale/AU/mutations/gplq.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const flex = [
[
'default',
{
logo: Logo.PP_PAYPAL.WHITE,
logo: Logo.WORDMARK.WHITE,
headline: [
{
tag: 'xsmall'
Expand Down Expand Up @@ -66,11 +66,11 @@ export default {
styles: [
textWrap(textSize * 32, textSize, 'AU'),
xSmallFallback(textSize * 16),
messageLogoWidth(false, textSize * 4, textSize * 1.25),
messageLogoWidth(false, textSize * 5.1),
setLogoTop(textSize * 16),
addPeriod()
],
logo: Logo.PP_PAYPAL.COLOR,
logo: Logo.WORDMARK.BLACK,
headline: [
{
tag: 'medium',
Expand All @@ -90,7 +90,7 @@ export default {
}px) { .message__headline > .tag--medium > span > span:first-child { white-space: normal; } }`,
xSmallFallback(textSize * 10.75),
setLogoTop(textSize * 32),
messageLogoWidth(textSize * 6, textSize * 4, textSize * 1.25),
messageLogoWidth(textSize * 6, textSize * 5.1),
addPeriod()
]
})
Expand All @@ -103,7 +103,7 @@ export default {
textSize * 18.5
}px) { .message__headline > .tag--medium > span > span:first-child { white-space: normal; } }`,
xSmallFallback(textSize * 10.75),
messageLogoWidth(textSize * 6, textSize * 4, textSize * 1.25),
messageLogoWidth(textSize * 6, textSize * 5.1),
addPeriod()
]
})
Expand All @@ -116,10 +116,10 @@ export default {
textWrap(textSize * 32, textSize, 'AU'),
xSmallFallback(textSize * 11.5),
altNoWrap(textSize * 10.6),
messageLogoWidth(textSize * 1.75, textSize * 4, textSize * 1.25),
messageLogoWidth(textSize * 1.75, textSize * 1.35),
addPeriod()
],
logo: Logo.PP_PAYPAL.COLOR[0]
logo: Logo.PP_MONOGRAM.COLOR
})
],
[
Expand All @@ -143,8 +143,8 @@ export default {
[
'logo.type:inline',
({ textSize }) => ({
styles: [xSmallFallback(textSize * 18), `.message__logo { width: ${textSize * 4}px }`],
logo: Logo.NO_PP_MONOGRAM.COLOR,
styles: [xSmallFallback(textSize * 18), `.message__logo { width: ${textSize * 3.5}px }`],
logo: Logo.WORDMARK.BLACK,
headline: [
{
tag: 'medium',
Expand Down
17 changes: 5 additions & 12 deletions src/server/locale/AU/styles/flex/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

.message__headline {
font-size: 8.4vw;
font-weight: 500;
line-height: 1.6em;
font-weight: 700;
line-height: 32px;
}

.message__disclaimer {
Expand All @@ -28,14 +28,7 @@
text-decoration: underline;
}

.message__logo:nth-of-type(1) {
width: 27px;
display: inline-block;
margin-right: 10px;
}

.message__logo:nth-of-type(2) {
width: 89px;
.message__logo {
display: inline-block;
}

Expand All @@ -47,11 +40,11 @@
}

.message__headline > span:nth-child(2) > strong {
font-weight: 500;
font-weight: 700;
}

.message__headline > span:nth-child(3) > strong {
font-weight: 500;
font-weight: 700;
}

@media (min-width: 220px) {
Expand Down
16 changes: 5 additions & 11 deletions src/server/locale/AU/styles/flex/ratio--1x1.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,20 @@
margin-bottom: 12%;
}

.message__logo:nth-of-type(1) {
width: 29px;
max-width: 15%;
.message__logo {
max-width: 30%;
margin-right: 0px;
}

.message__logo:nth-of-type(2) {
width: 91px;
max-width: 45%;
margin-left: 3%;
}

.message__headline {
font-size: 10vw;
line-height: 1.55em;
line-height: normal;
}

@media (min-width: 140px) {
@media (min-width: 240px) {
.message__headline {
font-size: 8.4vw;
line-height: 32px;
}

.message__headline span.multi:nth-of-type(1) {
Expand Down
4 changes: 4 additions & 0 deletions src/server/locale/AU/styles/flex/ratio--1x4.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
margin-bottom: 0;
}

.message__logo {
width: 55%;
}

.message__messaging {
height: 100%;
transform: translateY(-80px);
Expand Down
54 changes: 20 additions & 34 deletions src/server/locale/AU/styles/flex/ratio--20x1.css
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
@media (min-aspect-ratio: 200/11) {
.message__logo-container {
margin-bottom: -3px;
max-width: 12%;
margin-right: 1.5vw;
}

.message__logo:nth-of-type(1) {
width: 15%;
margin-right: 3%;
width: 20%;
max-width: 50%;
}

.message__logo:nth-of-type(2) {
width: 55%;
.message__logo {
width: 30%;
}

.message__promo-container {
width: unset;
}

.message__messaging {
flex: none;
display: inline;
}

Expand All @@ -31,8 +24,8 @@
margin-left: 0;
}

.message__disclaimer {
margin-left: 4px;
.message__headline {
margin-right: 4px;
}
}

Expand All @@ -42,27 +35,18 @@
}
}
@media (min-aspect-ratio: 200/11) and (min-width: 903px) {
.message__logo-container {
margin-bottom: -6px;
}
}
@media (min-aspect-ratio: 200/11) and (min-width: 400px) {
.message__headline {
font-size: 2vw;
font-size: 1.8vw;
}

.message__headline > span:nth-of-type(3) {
display: inline;
}

.message__logo:nth-of-type(1) {
width: 20%;
margin-right: 5%;
}

.message__logo:nth-of-type(2) {
display: inline-block;
width: 60%;
.message__logo {
width: 30%;
}
}

Expand All @@ -77,22 +61,18 @@
}

@media (min-aspect-ratio: 200/11) and (max-width: 600px) {
.message__logo:nth-of-type(2) {
display: none;
}

.message__logo:nth-of-type(1) {
width: auto;
.message__logo-container {
max-width: 50%;
}

.message__logo-container {
max-width: 18%;
.message__logo {
width: 30%;
}
}

@media (min-aspect-ratio: 200/11) and (min-width: 401px) and (max-width: 522px) {
.message__logo-container {
max-width: 18%;
max-width: 50%;
}

.message__headline {
Expand All @@ -109,3 +89,9 @@
font-size: 10px;
}
}

@media (min-aspect-ratio: 200/11) and (min-width: 600px) {
.message__headline {
line-height: normal;
}
}
Loading
Loading