diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index 7ddd981d..ba3ba3cd 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -152,6 +152,7 @@ "Hot topics": "Hot topics", "Hotkeys": "Горячие клавиши", "How can I help/skills": "How can I help/skills", + "How to help": "How to help?", "How it works": "How it works", "How to write a good article": "Как написать хорошую статью", "How to write an article": "How to write an article", @@ -199,6 +200,7 @@ "My feed": "My feed", "My subscriptions": "Subscriptions", "Name": "Name", + "Newsletter": "Newsletter", "New literary work": "New literary work", "New only": "New only", "New password": "New password", @@ -283,6 +285,7 @@ "Subscribe": "Subscribe", "Subscribe what you like to tune your personal feed": "Subscribe to topics that interest you to customize your personal feed and get instant updates on new posts and discussions", "Subscribe who you like to tune your personal feed": "Subscribe to authors you're interested in to customize your personal feed and get instant updates on new posts and discussions", + "Subscribe us": "Subscribe us", "Subscription": "Subscription", "Subscriptions": "Subscriptions", "Substrate": "Substrate", @@ -347,6 +350,7 @@ "You've confirmed email": "You've confirmed email", "You've reached a non-existed page": "You've reached a non-existed page", "Your name will appear on your profile page and as your signature in publications, comments and responses.": "Your name will appear on your profile page and as your signature in publications, comments and responses", + "Your email": "Your email", "accomplices": "accomplices", "actions": "actions", "add link": "add link", diff --git a/public/locales/ru/translation.json b/public/locales/ru/translation.json index 35ccc77d..6ba810df 100644 --- a/public/locales/ru/translation.json +++ b/public/locales/ru/translation.json @@ -160,6 +160,7 @@ "Hotkeys": "Горячие клавиши", "How can I help/skills": "Чем могу помочь/навыки", "How it works": "Как это работает", + "How to help": "Как помочь?", "How to write a good article": "Как написать хорошую статью", "How to write an article": "Как написать статью", "I have an account": "У меня есть аккаунт!", @@ -208,6 +209,7 @@ "My feed": "Моя лента", "My subscriptions": "Подписки", "Name": "Имя", + "Newsletter": "Рассылка", "New literary work": "Новое произведение", "New only": "Только новые", "New password": "Новый пароль", @@ -300,6 +302,7 @@ "Subscribe to comments": "Подписаться на комментарии", "Subscribe what you like to tune your personal feed": "Подпишитесь на интересующие вас темы, чтобы настроить вашу персональную ленту и моментально узнавать о новых публикациях и обсуждениях", "Subscribe who you like to tune your personal feed": "Подпишитесь на интересующих вас авторов, чтобы настроить вашу персональную ленту и моментально узнавать о новых публикациях и обсуждениях", + "Subscribe us": "Подпишитесь на нас", "Subscription": "Подписка", "subscription": "подписка", "Subscriptions": "Подписки", @@ -367,6 +370,7 @@ "You've reached a non-existed page": "Вы попали на несуществующую страницу", "You've successfully logged out": "Вы успешно вышли из аккаунта", "Your name will appear on your profile page and as your signature in publications, comments and responses.": "Ваше имя появится на странице вашего профиля и как ваша подпись в публикациях, комментариях и откликах", + "Your email": "Ваш email", "actions": "действия", "add link": "добавить ссылку", "all topics": "все темы", diff --git a/src/components/Nav/Header/Header.module.scss b/src/components/Nav/Header/Header.module.scss index 2bf2a521..c69c9908 100644 --- a/src/components/Nav/Header/Header.module.scss +++ b/src/components/Nav/Header/Header.module.scss @@ -56,6 +56,10 @@ margin: 0; padding: 0; z-index: 9; + + @include media-breakpoint-down(md) { + border-bottom: 2px solid #000; + } } } @@ -121,8 +125,9 @@ .mainNavigation { font-size: 1.4rem !important; - margin: 0 0 0 -0.4rem !important; + //margin: 0 0 0 -0.4rem !important; opacity: 1; + overflow: auto; transition: opacity 0.3s; @include media-breakpoint-down(md) { @@ -130,37 +135,64 @@ bottom: 0; display: none; font-size: 2.6rem; - font-weight: bold; + font-weight: 500; left: 0; padding: $container-padding-x !important; position: fixed; - top: 74px; + top: 64px; width: 100%; z-index: 1; li { margin-bottom: 2.4rem !important; } + + &.fixed { + display: block !important; + line-height: 1.1; + + ul { + display: block; + font-size: 3.2rem !important; + font-weight: bold; + margin: 0 0 5rem; + } + + li { + display: block !important; + margin: 0 0 1.5rem !important; + } + + a, + button { + border: none !important; + } + + .mobileCopyright { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + + a { + border-bottom: 1px solid !important; + } + } + } } @include media-breakpoint-down(sm) { padding: divide($container-padding-x, 2) !important; } - @include media-breakpoint-down(md) { - :global(.fixed) & { - font-size: 2.2rem !important; - - &, - li { - display: block !important; - } + @include media-breakpoint-up(md) { + a, + button { + padding: 0 0.4rem; } } - a, - button { - padding: 0 0.4rem; + ul { + margin-top: 0; } li { @@ -170,6 +202,51 @@ text-transform: capitalize; } } + + h4 { + color: #9fa1a7; + font-size: 1.4rem; + letter-spacing: 0.05em; + text-transform: uppercase; + } +} + +.mainNavigationMobile { + display: none; + + .fixed & { + display: block; + } +} + +.mainNavigationSocial a { + display: flex; + justify-content: space-between; + + &:hover { + .icon { + filter: invert(1); + } + } + + .icon { + height: 3.8rem; + width: 3.8rem; + } +} + +.mobileDescription { + color: #696969; +} + +.mobileSubscription { + margin-bottom: 5rem; + + input[type='email'] { + background: #f7f7f8; + border: none; + border-radius: 1.6rem; + } } .mainNavigationItemActive { diff --git a/src/components/Nav/Header/Header.tsx b/src/components/Nav/Header/Header.tsx index 0bab2f76..3c3acd21 100644 --- a/src/components/Nav/Header/Header.tsx +++ b/src/components/Nav/Header/Header.tsx @@ -1,4 +1,4 @@ -import { For, Show, createSignal, createEffect, onMount, onCleanup } from 'solid-js' +import { Show, createSignal, createEffect, onMount, onCleanup, For } from 'solid-js' import { getPagePath, redirectPage } from '@nanostores/router' import { clsx } from 'clsx' @@ -175,56 +175,132 @@ export const Header = (props: Props) => {
{props.title}
 - +
+ + +
+

{t('Join the community')}

+ + +

+ + +

{t('Newsletter')}

+
+
+ + +
+
+ +

+

+ {t('Discours')} © 2015–{new Date().getFullYear()}{' '} + {t('Terms of use')} +
+
+
@@ -285,10 +361,10 @@ export const Header = (props: Props) => { Гид по дискурсу
  • - Как поддержать? + {t('Support us')}
  • - Как помочь? + {t('How to help')}
  • diff --git a/src/components/_shared/GrowingTextarea/GrowingTextarea.tsx b/src/components/_shared/GrowingTextarea/GrowingTextarea.tsx index fc53411b..65996671 100644 --- a/src/components/_shared/GrowingTextarea/GrowingTextarea.tsx +++ b/src/components/_shared/GrowingTextarea/GrowingTextarea.tsx @@ -1,6 +1,6 @@ import { clsx } from 'clsx' import styles from './GrowingTextarea.module.scss' -import { createEffect, createSignal, onMount, Show } from 'solid-js' +import { createEffect, createSignal, Show } from 'solid-js' type Props = { class?: string diff --git a/src/pages/profile/profileSettings.page.tsx b/src/pages/profile/profileSettings.page.tsx index ea1a54a2..192401a2 100644 --- a/src/pages/profile/profileSettings.page.tsx +++ b/src/pages/profile/profileSettings.page.tsx @@ -1,7 +1,7 @@ import { PageLayout } from '../../components/_shared/PageLayout' import { Icon } from '../../components/_shared/Icon' import ProfileSettingsNavigation from '../../components/Discours/ProfileSettingsNavigation' -import { For, createSignal, Show, onMount, onCleanup, createEffect, on } from 'solid-js' +import { For, createSignal, Show, onMount, onCleanup, createEffect } from 'solid-js' import deepEqual from 'fast-deep-equal' import { clsx } from 'clsx' import styles from './Settings.module.scss' @@ -18,7 +18,6 @@ import { createStore } from 'solid-js/store' import { clone } from '../../utils/clone' import SimplifiedEditor from '../../components/Editor/SimplifiedEditor' import { GrowingTextarea } from '../../components/_shared/GrowingTextarea' -import { resetSortedArticles } from '../../stores/zine/articles' export const ProfileSettingsPage = () => { const { t } = useLocalize()