diff --git a/src/components/Author/AuthorCard/AuthorCard.module.scss b/src/components/Author/AuthorCard/AuthorCard.module.scss index 8d3feb6b..9f7124d0 100644 --- a/src/components/Author/AuthorCard/AuthorCard.module.scss +++ b/src/components/Author/AuthorCard/AuthorCard.module.scss @@ -12,6 +12,27 @@ margin-bottom: 2.4rem; } + .listWrapper & { + align-items: flex-start; + margin-bottom: 2rem; + + @include media-breakpoint-down(sm) { + margin-bottom: 3rem; + } + + @include media-breakpoint-between(md, lg) { + margin-bottom: 3rem; + } + + .circlewrap { + margin-top: 1rem; + } + + .authorDetailsWrapper { + margin-bottom: 1rem; + } + } + @include media-breakpoint-down(lg) { flex-wrap: wrap; } @@ -40,6 +61,7 @@ .authorDetailsWrapper { flex: 1 0; + position: relative; @include media-breakpoint-up(sm) { flex: 1; @@ -64,18 +86,28 @@ font-weight: 500; line-height: 2; margin-bottom: 0.8rem; + + .listWrapper &:before { + content: ''; + height: 100%; + left: 0; + position: absolute; + top: 0; + width: 100%; + z-index: 2; + } } .authorAbout { color: rgb(0 0 0 / 60%); font-size: 1.4rem; - line-height: 1.4; + font-weight: 500; + line-height: 1.3; word-break: break-word; } .authorSubscribe { align-items: center; - //display: flex; @include media-breakpoint-down(md) { flex-wrap: wrap; @@ -526,7 +558,6 @@ .listWrapper { max-height: 70vh; - overflow: auto; //padding-right: 2rem; :global(.row) { @@ -535,14 +566,19 @@ } .switcherCounter { + align-items: center; background: #f7f7f8; border-radius: 0.8rem; - display: inline-block; + display: inline-flex; font-size: 1.2rem; font-weight: bold; - line-height: 1.2; + height: 2.2rem; + justify-content: center; + line-height: 2.2rem; margin-left: 0.4rem; - padding: 0.4rem 0.6rem; + min-width: 2.2rem; + padding: 0 0.6rem; + text-align: center; } :global(.view-switcher__item--selected) .switcherCounter { diff --git a/src/components/Author/AuthorCard/AuthorCard.tsx b/src/components/Author/AuthorCard/AuthorCard.tsx index ee877937..4f1ef489 100644 --- a/src/components/Author/AuthorCard/AuthorCard.tsx +++ b/src/components/Author/AuthorCard/AuthorCard.tsx @@ -377,7 +377,7 @@ export const AuthorCard = (props: Props) => { - + <>

{t('Followers')}

@@ -404,7 +404,7 @@ export const AuthorCard = (props: Props) => { - + <>

{t('Subscriptions')}

    @@ -447,7 +447,14 @@ export const AuthorCard = (props: Props) => { showPublicationsCounter={true} /> ) : ( - + ) } diff --git a/src/components/Feed/CardTopic.module.scss b/src/components/Feed/CardTopic.module.scss index b9fe1ebc..445fb8e2 100644 --- a/src/components/Feed/CardTopic.module.scss +++ b/src/components/Feed/CardTopic.module.scss @@ -11,14 +11,22 @@ background: transparent; border: none; color: $link-color; - position: relative; - z-index: 2; &:hover { background: $link-color; color: #fff !important; } } + + a:before { + content: ''; + height: 100%; + left: 0; + position: absolute; + top: 0; + width: 100%; + z-index: 2; + } } .shoutTopicFloorImportant { @@ -35,4 +43,9 @@ .shoutTopicFeedMode { font-size: 1.2rem; + + a { + position: relative; + z-index: 2; + } } diff --git a/src/components/Nav/Modal/Modal.tsx b/src/components/Nav/Modal/Modal.tsx index 565fc1d8..94ecf98d 100644 --- a/src/components/Nav/Modal/Modal.tsx +++ b/src/components/Nav/Modal/Modal.tsx @@ -43,7 +43,7 @@ export const Modal = (props: Props) => { return (
    -
    +
    { @@ -108,6 +109,14 @@ export const TopicCard = (props: TopicProps) => { {props.topic.body}
    + 0}> +
    + {props.topic.stat?.shouts} публикаций +
    +