Skip to content

refactor: 5.1 styling for UK Hub #1174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gillycheesesteak merged 3 commits into from
Feb 24, 2025
Merged

refactor: 5.1 styling for UK Hub #1174

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f308a9b
update hub styling for 5.1
yeul Feb 11, 2025
1606252
update
yeul Feb 18, 2025
b291133
update
yeul Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions content/modals/GB/short_term.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"maxAmount": "{maxAmount}",
"qualifying": "{qualifying_offer}",
"amount": "{transaction_amount}",
"useV5Design": "false",
"apr": "{apr}",
"variables": {
"transaction_amount": "${eval(transaction_amount ? transaction_amount : '-')}",
Expand Down
2 changes: 1 addition & 1 deletion src/components/modal/v2/parts/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const Header = ({
<h2
// id used for aria-labelleby on modal container element
id="header__headline"
className={`headline-${countryClassName}`}
className={`headline-${countryClassName} ${useV5Design ? 'v5Design' : ''}`}
// eslint-disable-next-line react/no-danger
dangerouslySetInnerHTML={{ __html: headline }}
/>
Expand Down
9 changes: 3 additions & 6 deletions src/components/modal/v2/parts/views/ShortTerm/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

@include mobile {
padding: 0 0 15px;
justify-content: space-between;
}

@include smallMobile {
Expand All @@ -44,18 +45,14 @@
.checkout & {
padding: 0px;
}

.v5Design & {
@include tablet {
margin-top: 20px;
margin-bottom: 20px;
}
}
}

&.checkout {
margin-bottom: 20px;
}
}

.learnMoreLink__container {
Expand Down Expand Up @@ -157,7 +154,7 @@
padding-top: 24px;
margin-top: auto !important;
}

&.checkout {
padding-bottom: 60px;
@include mobile {
Expand Down
16 changes: 8 additions & 8 deletions src/components/modal/v2/styles/components/_donut.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ $donut-text-v5: #545d68;

width: 80px;

svg {
max-width: 50px;
}
&.donut__qualifying_payment {
svg {
text {
Expand All @@ -43,6 +40,7 @@ $donut-text-v5: #545d68;
}

svg {
max-width: 50px;
width: 100%;

text {
Expand Down Expand Up @@ -99,7 +97,6 @@ $donut-text-v5: #545d68;

.checkout & {
font-size: 16px;
margin-top: -0.5rem;
}
}

Expand Down Expand Up @@ -132,7 +129,7 @@ $donut-text-v5: #545d68;
display: flex;
flex-direction: column;
align-items: center;

&::after {
content: '';
flex-grow: 1;
Expand All @@ -159,10 +156,14 @@ $donut-text-v5: #545d68;
margin-bottom: 12px;
}
}

&__3 {
@extend .donut__single_payment_line;
.svg {
@include mobile {
position: relative;
}

&::after {
max-width: 85px;
transform: translateX((100%));
Expand All @@ -172,8 +173,7 @@ $donut-text-v5: #545d68;
transform: translateX((75%));
}
@include mobile {
max-width: min(70px, calc(100vw * 0.2));
margin-left: auto;
max-width: none;
padding-left: 2px;
}
@include smallMobile {
Expand Down
13 changes: 11 additions & 2 deletions src/components/modal/v2/styles/components/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,13 @@
max-width: 75%;
}
}

&.v5Design {
font-family: $paypal-pro;
font-weight: bold;
font-size: 32px;
line-height: 36px;
}
}

.subheadline_p {
Expand Down Expand Up @@ -387,7 +394,7 @@
}
}
}

&.checkout {
background-color: $ql-gray;

Expand All @@ -403,8 +410,10 @@
}

h2 {
font-family: $paypal-pro;
font-weight: bold;
margin-top: 20px;
margin-bottom: 0px;
margin-bottom: 5px;

@include tablet {
margin-left: 20px;
Expand Down
24 changes: 24 additions & 0 deletions src/components/modal/v2/styles/globals/_fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
// PPUI 5.1
@font-face {
font-family: 'PayPalPro';
src: url(https://www.paypalobjects.com/marketing/pp-com-components/fonts/SupremeLLTestSubWeb-Bold.woff)
format('woff');
font-weight: bold;
font-style: normal;
}
@font-face {
font-family: 'PayPalPro';
src: url(https://www.paypalobjects.com/marketing/pp-com-components/fonts/SupremeLLTestSubWeb-Black.woff)
format('woff');
font-weight: bold;
font-style: normal;
}
@font-face {
font-family: 'PayPalPro';
src: url(https://www.paypalobjects.com/marketing/pp-com-components/fonts/SupremeLLTestSubWeb-Book.woff)
format('woff');
font-weight: normal;
font-style: normal;
}

// TODO: Remove once all modals on 5.1
@font-face {
font-family: 'PayPalOpen';
src: url(https://www.paypalobjects.com/paypal-ui/fonts/PayPalOpen-Bold.woff) format('woff');
Expand Down
1 change: 1 addition & 0 deletions src/components/modal/v2/styles/globals/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ $content-wrapper-border-radius: 10px;
$content-wrapper-border-radius-checkout: 32px;

$paypal-open: PayPalOpen, Helvetica, Arial, Sans-Serif;
$paypal-pro: PayPalPro, Helvetica, Arial, Sans-Serif;
Loading