From dd2746e19eb1192a974d7819875323881d171af9 Mon Sep 17 00:00:00 2001 From: kvakazyambra Date: Tue, 28 Nov 2023 00:44:58 +0300 Subject: [PATCH] Fixed profile settings style --- .../Author/AuthorCard/AuthorCard.module.scss | 3 +- .../ProfileSettings/ProfileSettings.tsx | 35 +++++++++++-------- src/context/profile.tsx | 2 +- src/pages/profile/Settings.module.scss | 9 +++-- 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/components/Author/AuthorCard/AuthorCard.module.scss b/src/components/Author/AuthorCard/AuthorCard.module.scss index eee554b7..98e1206e 100644 --- a/src/components/Author/AuthorCard/AuthorCard.module.scss +++ b/src/components/Author/AuthorCard/AuthorCard.module.scss @@ -420,7 +420,6 @@ flex-wrap: wrap; font-size: 1.4rem; margin-top: 1.5rem; - gap: 1rem; @include media-breakpoint-down(md) { justify-content: center; @@ -431,7 +430,7 @@ align-items: center; cursor: pointer; display: inline-flex; - margin-right: 3rem; + margin: 0 2% 1rem; vertical-align: top; border-bottom: unset !important; diff --git a/src/components/ProfileSettings/ProfileSettings.tsx b/src/components/ProfileSettings/ProfileSettings.tsx index 08e5aeb7..4d515194 100644 --- a/src/components/ProfileSettings/ProfileSettings.tsx +++ b/src/components/ProfileSettings/ProfileSettings.tsx @@ -315,19 +315,21 @@ export const ProfileSettings = () => {

{t('It does not look like url')}

- - {(network) => ( - handleChangeSocial(value)} - isExist={!network.isPlaceholder} - slug={form.slug} - handleDelete={() => handleDeleteSocialLink(network.link)} - /> - )} - + + + {(network) => ( + handleChangeSocial(value)} + isExist={!network.isPlaceholder} + slug={form.slug} + handleDelete={() => handleDeleteSocialLink(network.link)} + /> + )} + + @@ -343,7 +345,12 @@ export const ProfileSettings = () => {
-
diff --git a/src/context/profile.tsx b/src/context/profile.tsx index 1af825ad..12a3d08d 100644 --- a/src/context/profile.tsx +++ b/src/context/profile.tsx @@ -24,7 +24,7 @@ export function useProfileForm() { } const userpicUrl = (userpic: string) => { - if (userpic.includes('assets.discours.io')) { + if (userpic && userpic.includes('assets.discours.io')) { return userpic.replace('100x', '500x500') } return userpic diff --git a/src/pages/profile/Settings.module.scss b/src/pages/profile/Settings.module.scss index 22040ba6..4ea3cb1d 100644 --- a/src/pages/profile/Settings.module.scss +++ b/src/pages/profile/Settings.module.scss @@ -291,13 +291,18 @@ h5 { .content { display: flex; align-items: center; - justify-content: space-around; + justify-content: space-between; flex-direction: row; padding: 1rem 0; gap: 1rem; } .cancel { - margin-right: auto; + color: #d00820; + padding: 0.8rem 0 !important; + } + + :global(.row) > * { + margin-bottom: 0; } }