diff --git a/src/components/Editor/TopicSelect/TopicSelect.scss b/src/components/Editor/TopicSelect/TopicSelect.scss index 86d0c808..831880a5 100644 --- a/src/components/Editor/TopicSelect/TopicSelect.scss +++ b/src/components/Editor/TopicSelect/TopicSelect.scss @@ -1,5 +1,7 @@ .TopicSelect .solid-select-list { background: #fff; + position: relative; + z-index: 13; } .TopicSelect .solid-select-option[data-disabled='true'] { diff --git a/src/components/Views/Edit.tsx b/src/components/Views/Edit.tsx index ca96985d..f7729c8c 100644 --- a/src/components/Views/Edit.tsx +++ b/src/components/Views/Edit.tsx @@ -347,9 +347,6 @@ export const EditView = (props: Props) => { - - - @@ -362,7 +359,9 @@ export const EditView = (props: Props) => { - + + + ) diff --git a/src/components/Views/PublishSettings/PublishSettings.module.scss b/src/components/Views/PublishSettings/PublishSettings.module.scss index 4b0e8ecc..c9d23b34 100644 --- a/src/components/Views/PublishSettings/PublishSettings.module.scss +++ b/src/components/Views/PublishSettings/PublishSettings.module.scss @@ -138,15 +138,22 @@ } .formActions { - display: flex; - align-items: center; - justify-content: flex-end; - flex-direction: row; - padding: 1rem 0; - gap: 1rem; - margin-top: 80px; + background: var(--background-color); + position: sticky; + z-index: 12; + bottom: 0; border-top: 2px solid var(--black-100); + margin-top: 80px; + margin-bottom: -40px; + .content { + display: flex; + align-items: center; + justify-content: flex-end; + flex-direction: row; + padding: 1rem 0; + gap: 1rem; + } .cancel { margin-right: auto; } diff --git a/src/components/Views/PublishSettings/PublishSettings.tsx b/src/components/Views/PublishSettings/PublishSettings.tsx index db448aa5..fae8ce9f 100644 --- a/src/components/Views/PublishSettings/PublishSettings.tsx +++ b/src/components/Views/PublishSettings/PublishSettings.tsx @@ -110,139 +110,159 @@ export const PublishSettings = (props: Props) => { } return ( -
-
- -
-

{t('Publish Settings')}

-

{t('Material card')}

-
-
-
-
- -
- {initialData.title} +
+
+
+
+
+
- -
- -
{settingsForm.mainTopic.title}
-
-
{settingsForm.title}
-
{settingsForm.subtitle}
-
{user().name}
+

{t('Publish Settings')}

+

{t('Material card')}

+
+
+
+
+ +
+ {initialData.title} +
+
+
+ +
{settingsForm.mainTopic.title}
+
+
{settingsForm.title}
+
{settingsForm.subtitle}
+
{user().name}
+
+
+
+

+ {t( + 'Choose a title image for the article. You can immediately see how the publication card will look like.' + )} +

+ +
+ setSettingsForm('title', value)} + allowEnterKey={false} + maxLength={100} + /> + setSettingsForm('subtitle', value)} + allowEnterKey={false} + maxLength={100} + /> + setSettingsForm('lead', value)} + allowEnterKey={false} + maxLength={MAX_LEAD_LIMIT} + /> +
+ +

{t('Slug')}

+
+ + +
+ +

{t('Topics')}

+

+ {t( + 'Add a few topics so that the reader knows what your content is about and can find it on pages of topics that interest them. Topics can be swapped, the first topic becomes the title' + )} +

+
+
+ + setForm('mainTopic', mainTopic)} + mainTopic={props.form.mainTopic} + /> + +
+ +
{formErrors.selectedTopics}
+
+
+ + {/*

Соавторы

*/} + {/*

У каждого соавтора можно добавить роль

*/} + {/*
*/} + {/*
*/} + {/* */} + {/* */} + {/*
*/} + {/* */} + {/*
*/} + + {/*
*/} + {/*
Михаил Драбкин
*/} + {/*
*/} + {/* */} + {/*
*/} + {/*
*/}
-

- {t( - 'Choose a title image for the article. You can immediately see how the publication card will look like.' - )} -

- -
- setSettingsForm('title', value)} - allowEnterKey={false} - maxLength={100} - /> - setSettingsForm('subtitle', value)} - allowEnterKey={false} - maxLength={100} - /> - setSettingsForm('lead', value)} - allowEnterKey={false} - maxLength={MAX_LEAD_LIMIT} - /> -
- -

{t('Slug')}

-
- - -
- -

{t('Topics')}

-

- {t( - 'Add a few topics so that the reader knows what your content is about and can find it on pages of topics that interest them. Topics can be swapped, the first topic becomes the title' - )} -

-
-
- - setForm('mainTopic', mainTopic)} - mainTopic={props.form.mainTopic} - /> - -
- -
{formErrors.selectedTopics}
-
-
- - {/*

Соавторы

*/} - {/*

У каждого соавтора можно добавить роль

*/} - {/*
*/} - {/*
*/} - {/* */} - {/* */} - {/*
*/} - {/* */} - {/*
*/} - - {/*
*/} - {/*
Михаил Драбкин
*/} - {/*
*/} - {/* */} - {/*
*/} - {/*
*/}
-
+
+
+
handleUploadModalContentCloseSetCover(value)} /> -
+ ) }