diff --git a/website/client/src/assets/images/gradient-swoop.png b/website/client/src/assets/images/gradient-swoop.png deleted file mode 100644 index 2e82b8e476..0000000000 Binary files a/website/client/src/assets/images/gradient-swoop.png and /dev/null differ diff --git a/website/client/src/assets/scss/typography.scss b/website/client/src/assets/scss/typography.scss index fac98c57d7..0b495912d7 100644 --- a/website/client/src/assets/scss/typography.scss +++ b/website/client/src/assets/scss/typography.scss @@ -131,10 +131,18 @@ h4 { color: $maroon-50 !important; } +.purple-200 { + color: $purple-200 !important; +} + .purple-300 { color: $purple-300 !important; } +.purple-600 { + color: $purple-600 !important; +} + .teal-1 { color: $teal-1 !important; } diff --git a/website/client/src/assets/svg/gradient-swoop.svg b/website/client/src/assets/svg/gradient-swoop.svg deleted file mode 100644 index 70a2e21576..0000000000 --- a/website/client/src/assets/svg/gradient-swoop.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/website/client/src/assets/svg/hourglass-sparkle-left.svg b/website/client/src/assets/svg/hourglass-sparkle-left.svg new file mode 100644 index 0000000000..c4d221fbb8 --- /dev/null +++ b/website/client/src/assets/svg/hourglass-sparkle-left.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/website/client/src/assets/svg/hourglass-sparkle-right.svg b/website/client/src/assets/svg/hourglass-sparkle-right.svg new file mode 100644 index 0000000000..0388d0d736 --- /dev/null +++ b/website/client/src/assets/svg/hourglass-sparkle-right.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/website/client/src/components/settings/subscription.vue b/website/client/src/components/settings/subscription.vue index ed38c7b7d5..5c407aaf6a 100644 --- a/website/client/src/components/settings/subscription.vue +++ b/website/client/src/components/settings/subscription.vue @@ -3,17 +3,18 @@
-

+

{{ $t('subscribeTo').toUpperCase() }}

@@ -25,12 +26,12 @@
-

+

{{ $t('subscribersReceiveBenefits') }}

@@ -115,13 +116,13 @@ v-if="hasSubscription" class="d-flex flex-column align-items-center" > -

+

{{ $t('subscription') }}

-
+
-

+

{{ $t('youAreSubscribed') }}

{{ $t('youHaveGroupPlan') }}
-
+

+
-
- {{ $t('needToUpdateCard') }} -
-
-
-

+

{{ $t('youAreSubscribed') }}

-
- {{ $t('subscriptionStats') }} -
-
-
+
+
@@ -272,16 +261,17 @@ {{ user.purchased.plan.consecutive.count }}
-
+
{{ $t('subMonths') }}
-
-
+
@@ -289,77 +279,64 @@ {{ gemCap }}
-
- {{ $t('gemCap') }} -
-
-
-
-
-
-
-
- {{ nextHourGlass }} -
-
-
- {{ $t('nextHourglass') }}* +
+ {{ $t('monthlyGemsLabel') }}
- *{{ $t('nextHourglassDescription') }} +
+
+
+ {{ nextHourGlass }} +
+
+ {{ $t('nextHourglass') }} +
+
+
-
-
-
-
- {{ $t('giftSubscriptionText4') }} + {{ $t('nextHourglassDescription') }}
-
-

- {{ $t('cancelYourSubscription') }} -

-
- {{ $t('cancelSubInfoGroupPlan') }} -
-
-
-
-
-
- {{ $t('cancelSub') }} -
+ + {{ $t('cancelYourSubscription') }} + +
+ {{ $t('cancelSubInfoGroupPlan') }} +
+
@@ -383,7 +360,7 @@

{{ $t('giftSubscription') }}

-
@@ -408,7 +385,7 @@ p { margin-bottom: 0px; - line-height: 24px; + line-height: 1.71; } small { @@ -421,21 +398,15 @@ font-size: 16px; } - .block-header { - letter-spacing: 1ch; - font-weight: 700; - top: 24px; - } - - .btn-secondary { + .btn-gift { width: 448px; } .btn-update-card { - width: 12.5rem; - height: 2.5rem; border-radius: 4px; font-size: 14px; + padding: 4px 12px; + width: fit-content; } .cancel-card { @@ -458,19 +429,45 @@ border: 1px solid $green-50; } - .final-header { - margin-bottom: 70px; - } - .flip { - filter: flipH; transform: scaleX(-1); } - .gradient-swoop { - background-image: url('@/assets/svg/gradient-swoop.svg'); - height: 274px; - width: 1440px; + .full-banner { + height: 180px; + width: 100vw; + } + + @media only screen and (max-width: 922px) { + .full-banner { + width: 100%; + } + } + + .header-mid { + width: 347px; + } + + .header-top { + letter-spacing: 1ch; + font-weight: 700; + } + + .hourglass-preview { + height: 92px; + border-radius: 8px; + font-weight: 700; + + .white { + font-family: 'Roboto Condensed'; + font-size: 20px; + line-height: 1.4; + } + + .purple-600 { + font-size: 12px; + line-height: 1.33; + } } .header-mini { @@ -478,6 +475,18 @@ font-weight: bold; } + .justify-content-around { + gap: 16px; + } + + .left-0 { + left: 0px; + } + + .left-24 { + left: 24px; + } + .lh-71 { line-height: 1.71; } @@ -487,6 +496,12 @@ color: $gray-200; } + .next-hourglass-description { + font-size: 12px; + font-style: italic; + line-height: 1.33; + } + .number-heavy { font-size: 20px; font-weight: bold; @@ -494,14 +509,23 @@ color: $gray-50; } - .position-absolute { - position: absolute; - } - .purple-bar { background-color: $purple-400; height: 1px; - width: 432px; + width: 50%; + max-width: 432px; + } + + .purple-gradient { + background-image: linear-gradient($purple-300, $purple-200); + } + + .right-0 { + right: 0px; + } + + .right-24 { + right: 24px; } .round-container { @@ -512,18 +536,17 @@ margin-bottom: 16px; } - .stats-label { - font-size: 12px; - color: $gray-100; - margin-top: 6px; - font-weight: bold; - line-height: 1.33; + .stats-card { + border-radius: 8px; + width: 192px; + height: 88px; } - .stats-spacer { - width: 1px; - height: 3rem; - background-color: $gray-500; + .stats-label { + font-size: 12px; + margin-top: 6px; + font-weight: 700; + line-height: 1.33; } .sub-benefit { @@ -532,6 +555,12 @@ border-radius: 8px; } + .sub-card { + border-radius: 8px; + box-shadow: 0px 1px 3px 0px rgba($black, 0.12), 0px 1px 2px 0px rgba($black, 0.24); + width: 448px; + } + .svg-amazon-pay { width: 208px; } @@ -549,7 +578,7 @@ } .svg-check { - width: 36px; + width: 48px; color: $white; } @@ -627,37 +656,13 @@ height: 40px; } + .svg-stripe { + width: 96px; + } + .w-330p { width: 330px; } - - .w-55 { - width: 55%; - } - - .nextHourglassDescription { - font-size: 12px; - font-style: italic; - line-height: 1.33; - color: $gray-100; - margin-left: 100px; - margin-right: 100px; - } - - .justify-content-evenly { - justify-content: space-evenly; - } - - .thanks-for-support { - font-size: 12px; - line-height: 1.33; - text-align: center; - color: $gray-100; - } - - .stat-column { - width: 33%; - }