diff --git a/website/client/src/assets/images/g1g1-notif.png b/website/client/src/assets/images/g1g1-notif.png index 75633e6db2..2509b55313 100644 Binary files a/website/client/src/assets/images/g1g1-notif.png and b/website/client/src/assets/images/g1g1-notif.png differ diff --git a/website/client/src/assets/images/g1g1-send.png b/website/client/src/assets/images/g1g1-send.png index 774be0b37a..5a401c5bcb 100644 Binary files a/website/client/src/assets/images/g1g1-send.png and b/website/client/src/assets/images/g1g1-send.png differ diff --git a/website/client/src/components/header/notifications/g1g1.vue b/website/client/src/components/header/notifications/g1g1.vue index 7076ff7c08..a58028b686 100644 --- a/website/client/src/components/header/notifications/g1g1.vue +++ b/website/client/src/components/header/notifications/g1g1.vue @@ -6,14 +6,14 @@ v-once class="mx-auto mb-2" > - {{ $t('g1g1Announcement') }} + {{ $t('g1g1') }} -

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

+
@import '~@/assets/scss/colors.scss'; - p, strong { + small, strong { color: $white; } - p { - font-size: 14px; - } - .notification { background-image: url('~@/assets/images/g1g1-notif.png'); - background-size: 378px 204px; - width: 378px; - height: 204px; + height: 10rem; padding: 3rem; position: relative; overflow: hidden; diff --git a/website/client/src/components/payments/buyGemsModal.vue b/website/client/src/components/payments/buyGemsModal.vue index abdee6df28..da951ac4be 100644 --- a/website/client/src/components/payments/buyGemsModal.vue +++ b/website/client/src/components/payments/buyGemsModal.vue @@ -50,6 +50,33 @@
+
+
+
+
+ {{ $t('g1g1') }} + + {{ $t('g1g1Details') }} + +
+
+
+

-

+
+

{{ $t('g1g1') }}

+

{{ $t('g1g1Returning') }}

+
+

{{ $t('sendGift') }}

@@ -18,8 +28,8 @@ v-html="icons.close" >
-
- {{ $t('sendGiftToWhom') }} +
+

{{ $t('sendGiftToWhom') }}

{{ $t('userWithUsernameOrUserIdNotFound') }}
-
- - {{ $t('cancel') }} - +
+ + {{ $t('cancel') }} +
+
+ + {{ $t ('howItWorks') }} + +

+ {{ $t ('g1g1HowItWorks') }} +

+ + {{ $t ('limitations') }} + +

+ {{ $t ('g1g1Limitations') }} +

+
@@ -70,12 +110,22 @@ @import '~@/assets/scss/mixins.scss'; #select-user-modal { - @include centeredModal(); + .input-group { + margin-top: 0rem; + } .modal-dialog { width: 29.5rem; margin-top: 25vh; } + + .modal-footer { + padding: 0rem; + + > * { + margin: 0rem 0.25rem 0.25rem 0.25rem; + } + } } @@ -84,11 +134,12 @@ a:not([href]) { color: $blue-10; - font-size: 16px; + font-size: 0.875rem; + line-height: 1.71; } - .form-control { - width: 26.5rem; + #selectUser { + width: 22rem; border: 0px; color: $gray-50; } @@ -103,17 +154,28 @@ padding: 1.5rem; color: $white; - .heading { - font-size: 16px; - font-weight: bold; - margin-bottom: 1rem; + h1 { + font-size: 1.25rem; + line-height: 1.4; + color: $white; } - .details { - padding: 0rem 6rem; + p { + font-size: 0.75rem; + line-height: 1.33; + margin-left: 4rem; + margin-right: 4rem; + margin-bottom: 0rem; } } + .g1g1-fine-print { + color: $gray-100; + background-color: $gray-700; + font-size: 0.75rem; + line-height: 1.33; + } + .input-error { color: $red-50; font-size: 90%; @@ -149,6 +211,7 @@