Skip to content

Commit 6bbeab6

Browse files
Raphael RychetskyMargeBot
authored andcommitted
Refactor generic, drive and referral signup styles, use helpers, rename class names
1 parent c9b9d99 commit 6bbeab6

File tree

21 files changed

+41
-229
lines changed

21 files changed

+41
-229
lines changed

applications/account/src/app/signupCtx/flows/drive/components/Layout/Layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import './layout.scss';
44

55
const Layout = ({ children }: { children: ReactNode }) => {
66
return (
7-
<div className="flex *:min-size-auto flex-nowrap flex-column h-full overflow-auto relative drive-signup drive-signup-bg-gradient">
7+
<div className="flex *:min-size-auto flex-nowrap flex-column h-full overflow-auto relative scroll-smooth drive-signup drive-signup-bg-gradient">
88
<div>{children}</div>
99
</div>
1010
);

applications/account/src/app/signupCtx/flows/drive/components/Layout/Wrapper.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ export const Wrapper = ({ children, minHeight }: { children: ReactNode; minHeigh
77
style={{ '--min-h-custom': minHeight }}
88
>
99
<div className="flex items-center justify-center h-full">
10-
<div className="flex flex-column md:flex-row flex-nowrap items-center justify-center w-full drive-signup-layout-gap p-4">
10+
<div
11+
className="flex flex-column md:flex-row flex-nowrap items-center justify-center w-full p-4 gap-4 md:gap-custom"
12+
style={{ '--md-gap-custom': 'min(7vw, 10rem)' }}
13+
>
1114
{children}
1215
</div>
1316
</div>
Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
@import '~@proton/styles/scss/lib';
22

33
.drive-signup {
4-
scroll-behavior: smooth;
5-
64
.button-outline-norm {
75
--button-default-text-color: var(--interaction-norm-major-1);
86
}
@@ -11,15 +9,3 @@
119
.drive-signup-bg-gradient {
1210
background: linear-gradient(122deg, #fff 8.63%, #f7f5fe 69.23%);
1311
}
14-
15-
.drive-signup-layout-gap {
16-
gap: var(--space-4);
17-
18-
@include media('>medium') {
19-
gap: 6rem;
20-
}
21-
22-
@include media('>large') {
23-
gap: 10rem;
24-
}
25-
}

applications/account/src/app/signupCtx/flows/drive/components/PlanSelector/PlanCard.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@import '~@proton/styles/scss/lib';
22

3-
.planCard {
3+
.drive-signup-plan-card {
44
--plan-card-border-width: 3px;
55
--plan-card-border-radius: calc(var(--border-radius-lg) + var(--plan-card-border-width));
66
--plan-card-highlight-gradient: conic-gradient(

applications/account/src/app/signupCtx/flows/drive/components/PlanSelector/PlanCard.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,16 @@ const PlanCard = ({
4545
return (
4646
<div
4747
className={clsx(
48-
'planCard w-full p-6 max-w-custom relative',
49-
highlighted && 'planCard-highlighted',
50-
highlighted && highlightVariant === PlanCardBorderVariant.Plain && 'planCard-highlighted--default'
48+
'drive-signup-plan-card w-full p-6 max-w-custom relative',
49+
highlighted && 'drive-signup-plan-card-highlighted',
50+
highlighted &&
51+
highlightVariant === PlanCardBorderVariant.Plain &&
52+
'drive-signup-plan-card-highlighted--default'
5153
)}
5254
style={{ '--max-w-custom': '25rem' }}
5355
>
5456
{highlighted ? (
55-
<span className="planCard-label p-2 text-center text-semibold">{highlightTitle}</span>
57+
<span className="drive-signup-plan-card-label p-2 text-center text-semibold">{highlightTitle}</span>
5658
) : undefined}
5759

5860
<h3 className="text-bold text-xl mt-0 mb-2">{title}</h3>

applications/account/src/app/signupCtx/flows/drive/components/PricingCard/PricingCard.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.pricing-card {
1+
.drive-signup-pricing-card {
22
&-inner,
33
&-top {
44
border-radius: var(--border-radius-xl);
@@ -21,12 +21,12 @@
2121
}
2222
}
2323

24-
&:has(.pricing-card-top) &-inner {
24+
&:has(.drive-signup-pricing-card-top) &-inner {
2525
z-index: 2;
2626
border-radius: var(--border-radius-sm) var(--border-radius-sm) var(--border-radius-xl) var(--border-radius-xl);
2727
}
2828

29-
&:has(.pricing-card-top) &-top {
29+
&:has(.drive-signup-pricing-card-top) &-top {
3030
z-index: 1;
3131
border-radius: var(--border-radius-xl) var(--border-radius-xl) var(--border-radius-sm) var(--border-radius-sm);
3232
}

applications/account/src/app/signupCtx/flows/drive/components/PricingCard/PricingCard.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ export const PricingCard = ({ step }: { step: PricingStep }) => {
250250

251251
const showCouponBanner = hasFullCheckoutDetails && checkout.couponDiscount !== 0;
252252
const couponBanner = showCouponBanner && (
253-
<div className="pricing-card-top w-full shadow-raised bg-norm mb-1">
254-
<div className="pricing-card-top-content">
253+
<div className="drive-signup-pricing-card-top w-full shadow-raised bg-norm mb-1">
254+
<div className="drive-signup-pricing-card-top-content">
255255
<div className="flex items-center gap-2 px-8 py-4 fade-in">
256256
<IcBagPercentFilled className="shrink-0 color-primary" />
257257
<span className="text-semibold" data-testid="discountBanner">{c('Signup')
@@ -262,9 +262,9 @@ export const PricingCard = ({ step }: { step: PricingStep }) => {
262262
);
263263

264264
return (
265-
<section className={clsx('pricing-card w-full flex flex-column')}>
265+
<section className={clsx('drive-signup-pricing-card w-full flex flex-column')}>
266266
{couponBanner}
267-
<div className="pricing-card-inner fade-in w-full flex flex-column shadow-raised gap-8 py-8 bg-norm">
267+
<div className="drive-signup-pricing-card-inner fade-in w-full flex flex-column shadow-raised gap-8 py-8 bg-norm">
268268
<PricingHeader />
269269
<PricingFeatures />
270270
<PricingFooter step={step} />

applications/account/src/app/signupCtx/flows/genericStart/components/Layout/Layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import './layout.scss';
44

55
const Layout = ({ children }: { children: ReactNode }) => {
66
return (
7-
<div className="flex *:min-size-auto flex-nowrap flex-column h-full overflow-auto relative signup signup-bg-gradient">
7+
<div className="flex *:min-size-auto flex-nowrap flex-column h-full overflow-auto relative scroll-smooth generic-signup generic-signup-bg-gradient">
88
<div>{children}</div>
99
</div>
1010
);

applications/account/src/app/signupCtx/flows/genericStart/components/Layout/Wrapper.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ export const Wrapper = ({ children, minHeight }: { children: ReactNode; minHeigh
77
style={{ '--min-h-custom': minHeight }}
88
>
99
<div className="flex items-center justify-center h-full">
10-
<div className="flex flex-column md:flex-row flex-nowrap items-center justify-center w-full signup-layout-gap p-4">
10+
<div
11+
className="flex flex-column md:flex-row flex-nowrap items-center justify-center w-full p-4 gap-4 md:gap-custom"
12+
style={{ '--md-gap-custom': 'min(7vw, 10rem)' }}
13+
>
1114
{children}
1215
</div>
1316
</div>
Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,11 @@
11
@import '~@proton/styles/scss/lib';
22

3-
.signup {
4-
scroll-behavior: smooth;
5-
3+
.generic-signup {
64
.button-outline-norm {
75
--button-default-text-color: var(--interaction-norm-major-1);
86
}
97
}
108

11-
.signup-bg-gradient {
9+
.generic-signup-bg-gradient {
1210
background: linear-gradient(122deg, #fff 8.63%, #f7f5fe 69.23%);
1311
}
14-
15-
.signup-layout-gap {
16-
gap: var(--space-4);
17-
18-
@include media('>medium') {
19-
gap: 6rem;
20-
}
21-
22-
@include media('>large') {
23-
gap: 10rem;
24-
}
25-
}

0 commit comments

Comments
 (0)