From c20150902e77cee4261bb707327714905e9a6a63 Mon Sep 17 00:00:00 2001 From: sonnguyenkieio Date: Tue, 14 Sep 2021 19:08:05 +0700 Subject: [PATCH] :ambulance: fix Account Page --- .../AccountNavigationItem.module.scss | 4 ++-- .../AccountInfomation.module.scss | 21 +++++++++++++------ .../EditInfoModal/EditInfoModal.module.scss | 1 + 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/components/modules/account/AccountNavigation/components/AccountNavigationItem/AccountNavigationItem.module.scss b/src/components/modules/account/AccountNavigation/components/AccountNavigationItem/AccountNavigationItem.module.scss index 07952e6d8..8725597cf 100644 --- a/src/components/modules/account/AccountNavigation/components/AccountNavigationItem/AccountNavigationItem.module.scss +++ b/src/components/modules/account/AccountNavigation/components/AccountNavigationItem/AccountNavigationItem.module.scss @@ -1,7 +1,7 @@ @import '../../../../../../styles/utilities'; .accountNavigationItem { - @apply custom-border-radius; + @apply shape-common; width: fit-content; padding: 1.2rem 1.6rem 1.2rem 0rem; @@ -12,7 +12,7 @@ } &.active { - @apply custom-border-radius font-bold; + @apply shape-common font-bold; background-color: var(--primary); color: white; padding: 1.2rem 1.6rem 1.2rem 1.6rem; diff --git a/src/components/modules/account/AccountPage/components/AccountInfomation/AccountInfomation.module.scss b/src/components/modules/account/AccountPage/components/AccountInfomation/AccountInfomation.module.scss index 466dc3127..6e8150f1b 100644 --- a/src/components/modules/account/AccountPage/components/AccountInfomation/AccountInfomation.module.scss +++ b/src/components/modules/account/AccountPage/components/AccountInfomation/AccountInfomation.module.scss @@ -1,13 +1,11 @@ @import '../../../../../../styles/utilities'; .accountInfomation { - @apply flex justify-center items-center; - text-align: center; + @apply block text-center; margin-top: 1.6rem; @screen md { - @apply block; - text-align: left; + @apply text-left; margin-top: 0; } @@ -32,8 +30,13 @@ border: 1px solid var(--disabled); max-width: 39.2rem; min-width: 30rem; + margin: auto; margin-top: 2.4rem; margin-bottom: 2.4rem; + + @screen md { + margin-left: 0; + } } .shippingInfo { @@ -42,8 +45,14 @@ } .accountAddress { - max-width: 31rem; - min-width: none; + margin: auto; + max-width: 28rem; + + @screen md { + max-width: 31rem; + min-width: none; + margin-left: 0; + } } .editInfoBtn { diff --git a/src/components/modules/account/AccountPage/components/EditInfoModal/EditInfoModal.module.scss b/src/components/modules/account/AccountPage/components/EditInfoModal/EditInfoModal.module.scss index 1215ac2a3..20acd257b 100644 --- a/src/components/modules/account/AccountPage/components/EditInfoModal/EditInfoModal.module.scss +++ b/src/components/modules/account/AccountPage/components/EditInfoModal/EditInfoModal.module.scss @@ -17,6 +17,7 @@ @apply bg-white cursor-pointer; border: white; margin-right: 0.8rem; + height: fit-content; } .inputPostalCode {