From 8bb98c110426a19ca859cd8f21c6f905fbb5fe7a Mon Sep 17 00:00:00 2001 From: aizad-deriv Date: Tue, 7 Feb 2023 16:33:33 +0800 Subject: [PATCH 1/7] =?UTF-8?q?chore:=20change=20stylings=20add=20more=20p?= =?UTF-8?q?adding=20below=20to=20how=20content=20in=20different=20screen?= =?UTF-8?q?=20size=20=F0=9F=93=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../onboarding-new/static-dashboard.scss | 16 +++++++++++----- .../src/modules/onboarding/onboarding.scss | 1 - 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/appstore/src/components/onboarding-new/static-dashboard.scss b/packages/appstore/src/components/onboarding-new/static-dashboard.scss index d950e911b7d4..5eea72be336d 100644 --- a/packages/appstore/src/components/onboarding-new/static-dashboard.scss +++ b/packages/appstore/src/components/onboarding-new/static-dashboard.scss @@ -5,6 +5,10 @@ @include desktop { min-width: 132rem; } + @include mobile { + position: relative; + bottom: 2rem; + } &--deposit-button-blurry { opacity: 0.2; @@ -44,11 +48,6 @@ border: 1px solid var(--general-hover); padding: 2rem; border-radius: 2.4rem; - - @include mobile { - padding: 3rem; - border: none; - } } &__bordered--with-margin { @@ -56,9 +55,16 @@ padding: 2.4rem; border-radius: 2.4rem; margin-bottom: 2rem; + } + &__bordered, + &__bordered--with-margin { @include mobile { + padding: 3rem; border: none; + height: 38.7rem; + overflow-y: scroll; + overflow-x: hidden; } } diff --git a/packages/appstore/src/modules/onboarding/onboarding.scss b/packages/appstore/src/modules/onboarding/onboarding.scss index d8205a670bb8..208d97f5b7e1 100644 --- a/packages/appstore/src/modules/onboarding/onboarding.scss +++ b/packages/appstore/src/modules/onboarding/onboarding.scss @@ -21,7 +21,6 @@ height: 100%; @include mobile { - overflow-y: scroll; height: 60%; } } From 4ddfb8f142325a76aa4b685748823d52678f5928 Mon Sep 17 00:00:00 2001 From: aizad-deriv Date: Wed, 15 Feb 2023 06:48:09 +0800 Subject: [PATCH 2/7] fix: scroll issue on smaller screens --- .../src/components/onboarding-new/static-dashboard.scss | 2 +- packages/appstore/src/modules/onboarding/onboarding.scss | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/appstore/src/components/onboarding-new/static-dashboard.scss b/packages/appstore/src/components/onboarding-new/static-dashboard.scss index 5eea72be336d..9025cd1539a8 100644 --- a/packages/appstore/src/components/onboarding-new/static-dashboard.scss +++ b/packages/appstore/src/components/onboarding-new/static-dashboard.scss @@ -60,7 +60,7 @@ &__bordered, &__bordered--with-margin { @include mobile { - padding: 3rem; + padding: 3rem 3rem 15rem; border: none; height: 38.7rem; overflow-y: scroll; diff --git a/packages/appstore/src/modules/onboarding/onboarding.scss b/packages/appstore/src/modules/onboarding/onboarding.scss index 208d97f5b7e1..5cd46091b10c 100644 --- a/packages/appstore/src/modules/onboarding/onboarding.scss +++ b/packages/appstore/src/modules/onboarding/onboarding.scss @@ -33,6 +33,10 @@ bottom: 0; max-height: 20rem; + @include mobile { + max-height: 18rem; + } + &-wrapper { margin-top: 1rem; } From 3e980484ac60eca944d0268f0f832809f7b4590d Mon Sep 17 00:00:00 2001 From: aizad-deriv Date: Thu, 16 Feb 2023 14:22:45 +0800 Subject: [PATCH 3/7] feat: testing sikit From a51693ce1fe21fca6589626402bc5e881f985a98 Mon Sep 17 00:00:00 2001 From: aizad-deriv Date: Thu, 16 Feb 2023 15:00:44 +0800 Subject: [PATCH 4/7] fix: change onboarding sizing to fit mobile --- .../src/components/onboarding-new/static-dashboard.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/appstore/src/components/onboarding-new/static-dashboard.scss b/packages/appstore/src/components/onboarding-new/static-dashboard.scss index 9025cd1539a8..f1d9091095dd 100644 --- a/packages/appstore/src/components/onboarding-new/static-dashboard.scss +++ b/packages/appstore/src/components/onboarding-new/static-dashboard.scss @@ -62,7 +62,7 @@ @include mobile { padding: 3rem 3rem 15rem; border: none; - height: 38.7rem; + height: 30rem; overflow-y: scroll; overflow-x: hidden; } From a369e080b4f2da73075191080383cf3be17dcfaf Mon Sep 17 00:00:00 2001 From: aizad-deriv Date: Thu, 16 Feb 2023 15:22:56 +0800 Subject: [PATCH 5/7] fix: remove max-height on footer --- packages/appstore/src/modules/onboarding/onboarding.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/appstore/src/modules/onboarding/onboarding.scss b/packages/appstore/src/modules/onboarding/onboarding.scss index 5cd46091b10c..208d97f5b7e1 100644 --- a/packages/appstore/src/modules/onboarding/onboarding.scss +++ b/packages/appstore/src/modules/onboarding/onboarding.scss @@ -33,10 +33,6 @@ bottom: 0; max-height: 20rem; - @include mobile { - max-height: 18rem; - } - &-wrapper { margin-top: 1rem; } From 8794c4faaf281668020351a7d4e3977dd1d08100 Mon Sep 17 00:00:00 2001 From: aizad-deriv Date: Thu, 16 Feb 2023 16:14:53 +0800 Subject: [PATCH 6/7] fix: added more height to the body --- .../src/components/onboarding-new/static-dashboard.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/appstore/src/components/onboarding-new/static-dashboard.scss b/packages/appstore/src/components/onboarding-new/static-dashboard.scss index f1d9091095dd..deef66fed5d0 100644 --- a/packages/appstore/src/components/onboarding-new/static-dashboard.scss +++ b/packages/appstore/src/components/onboarding-new/static-dashboard.scss @@ -61,8 +61,8 @@ &__bordered--with-margin { @include mobile { padding: 3rem 3rem 15rem; + height: 35rem; border: none; - height: 30rem; overflow-y: scroll; overflow-x: hidden; } From 37e59eec2f9a0d288e6495da03e7fb6254282bb7 Mon Sep 17 00:00:00 2001 From: aizad-deriv Date: Thu, 16 Feb 2023 16:29:05 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20readjust=20body=20height=20(again?= =?UTF-8?q?=F0=9F=98=80)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/onboarding-new/static-dashboard.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/appstore/src/components/onboarding-new/static-dashboard.scss b/packages/appstore/src/components/onboarding-new/static-dashboard.scss index deef66fed5d0..fcc0799ccf1d 100644 --- a/packages/appstore/src/components/onboarding-new/static-dashboard.scss +++ b/packages/appstore/src/components/onboarding-new/static-dashboard.scss @@ -61,7 +61,7 @@ &__bordered--with-margin { @include mobile { padding: 3rem 3rem 15rem; - height: 35rem; + height: 36.5rem; border: none; overflow-y: scroll; overflow-x: hidden;