From f73456cea53a5567ed43fb6bd809b36c4623fc1f Mon Sep 17 00:00:00 2001 From: kvakazyambra Date: Fri, 24 Mar 2023 01:05:23 +0300 Subject: [PATCH] Fixed profile left column --- .../ProfileSettingsNavigation.module.scss | 3 +- src/components/Views/Author.module.scss | 2 +- src/components/Views/Feed.tsx | 2 +- src/pages/profile/Settings.module.scss | 4 + src/pages/profile/profileSecurity.page.tsx | 204 +++++++------- src/pages/profile/profileSettings.page.tsx | 264 +++++++++--------- .../profile/profileSubscriptions.page.tsx | 196 ++++++------- src/styles/app.scss | 16 -- 8 files changed, 342 insertions(+), 349 deletions(-) diff --git a/src/components/Discours/ProfileSettingsNavigation.module.scss b/src/components/Discours/ProfileSettingsNavigation.module.scss index 24cb0762..2bafc554 100644 --- a/src/components/Discours/ProfileSettingsNavigation.module.scss +++ b/src/components/Discours/ProfileSettingsNavigation.module.scss @@ -1,8 +1,7 @@ .navigationHeader { @include font-size(1.8rem); - font-weight: bold; - margin-top: 1.1em !important; + margin-top: 1.1em; } .navigation { diff --git a/src/components/Views/Author.module.scss b/src/components/Views/Author.module.scss index f1b8caeb..9b1bdb81 100644 --- a/src/components/Views/Author.module.scss +++ b/src/components/Views/Author.module.scss @@ -1,7 +1,7 @@ .ratingContainer { @include font-size(1.5rem); - display: inline-block; + display: inline-flex; vertical-align: top; } diff --git a/src/components/Views/Feed.tsx b/src/components/Views/Feed.tsx index 016405c6..2cd936ff 100644 --- a/src/components/Views/Feed.tsx +++ b/src/components/Views/Feed.tsx @@ -84,7 +84,7 @@ export const FeedView = () => { <>
-
+
diff --git a/src/pages/profile/Settings.module.scss b/src/pages/profile/Settings.module.scss index 056ae465..eed12635 100644 --- a/src/pages/profile/Settings.module.scss +++ b/src/pages/profile/Settings.module.scss @@ -114,6 +114,10 @@ h5 { .leftNavigation { top: 9rem !important; + + h4:first-child { + margin-top: 0; + } } .passwordToggleControl { diff --git a/src/pages/profile/profileSecurity.page.tsx b/src/pages/profile/profileSecurity.page.tsx index e53076d2..a32e13ce 100644 --- a/src/pages/profile/profileSecurity.page.tsx +++ b/src/pages/profile/profileSecurity.page.tsx @@ -8,120 +8,122 @@ export const ProfileSecurityPage = () => { return (
-
-
+
+
-
-
-

Вход и безопасность

-

Настройки аккаунта, почты, пароля и способов входа.

+
+
+
+

Вход и безопасность

+

Настройки аккаунта, почты, пароля и способов входа.

-
-

Почта

-
- - -
+ +

Почта

+
+ + +
-

Изменить пароль

-
Текущий пароль
-
- - -
+

Изменить пароль

+
Текущий пароль
+
+ + +
-
Новый пароль
-
- - -
+
Новый пароль
+
+ + +
-
Подтвердите новый пароль
-
- - -
+
Подтвердите новый пароль
+
+ + +
-

Социальные сети

-
Google
-
+

Социальные сети

+
Google
+
+

+ +

+
+ +
VK
+
+

+ +

+
+ +
Facebook
+
+

+ +

+
+ +
Apple
+
+

+ +

+
+ +

-

-
- -
VK
-
-

- -

-
- -
Facebook
-
-

- -

-
- -
Apple
-
-

- -

-
- -
-

- -

-
+ +
diff --git a/src/pages/profile/profileSettings.page.tsx b/src/pages/profile/profileSettings.page.tsx index b9f11fcf..de006dcf 100644 --- a/src/pages/profile/profileSettings.page.tsx +++ b/src/pages/profile/profileSettings.page.tsx @@ -84,145 +84,147 @@ export const ProfileSettingsPage = () => {
-
-
+
+
-
-
-

{t('Profile settings')}

-

{t('Here you can customize your profile the way you want.')}

-
-

{t('Userpic')}

-
-
- }> - {form.name} - -
-
-

{t('Name')}

-

- {t( - 'Your name will appear on your profile page and as your signature in publications, comments and responses.' - )} -

-
- updateFormField('name', event.currentTarget.value)} - value={form.name} - /> - -
- -

{t('Address on Discourse')}

-
-
- -
- updateFormField('slug', event.currentTarget.value)} - value={form.slug} - class="nolabel" - /> - -

{t(`${slugError()}`)}

+
+
+
+

{t('Profile settings')}

+

{t('Here you can customize your profile the way you want.')}

+ +

{t('Userpic')}

+
+
+ }> + {form.name}
-
- -

{t('Introduce')}

-
- - -
- -

{t('About myself')}

-
- + +
+ +

{t('About myself')}

+
+