diff --git a/src/components/Author/AuthorCard.module.scss b/src/components/Author/AuthorCard.module.scss index 027794e5..52d4cc78 100644 --- a/src/components/Author/AuthorCard.module.scss +++ b/src/components/Author/AuthorCard.module.scss @@ -168,8 +168,12 @@ display: none; } +.buttonLabelVisible { + display: block; +} + .buttonWrite { - @include font-size(1.5rem); + //@include font-size(1.5rem); color: #000; display: inline-flex; diff --git a/src/components/Author/AuthorCard.tsx b/src/components/Author/AuthorCard.tsx index f40c8cde..1384282c 100644 --- a/src/components/Author/AuthorCard.tsx +++ b/src/components/Author/AuthorCard.tsx @@ -27,6 +27,7 @@ interface AuthorCardProps { isAuthorsList?: boolean truncateBio?: boolean liteButtons?: boolean + isTextButton?: boolean isComments?: boolean isFeedMode?: boolean isNowrap?: boolean @@ -132,18 +133,22 @@ export const AuthorCard = (props: AuthorCardProps) => { onClick={() => subscribe(true)} class={clsx('button', styles.button)} classList={{ - [styles.buttonSubscribe]: !props.isAuthorsList, + [styles.buttonSubscribe]: !props.isAuthorsList && !props.isTextButton, 'button--subscribe': !props.isAuthorsList, - 'button--subscribe-topic': props.isAuthorsList, - [styles.buttonWrite]: props.isAuthorsList, + 'button--subscribe-topic': props.isAuthorsList || props.isTextButton, + [styles.buttonWrite]: props.isAuthorsList || props.isTextButton, [styles.isSubscribing]: isSubscribing() }} disabled={isSubscribing()} > - + - {t('Follow')} + + + {t('Follow')} + + } > @@ -151,18 +156,22 @@ export const AuthorCard = (props: AuthorCardProps) => { onClick={() => subscribe(false)} class={clsx('button', styles.button)} classList={{ - [styles.buttonSubscribe]: !props.isAuthorsList, + [styles.buttonSubscribe]: !props.isAuthorsList && !props.isTextButton, 'button--subscribe': !props.isAuthorsList, - 'button--subscribe-topic': props.isAuthorsList, - [styles.buttonWrite]: props.isAuthorsList, + 'button--subscribe-topic': props.isAuthorsList || props.isTextButton, + [styles.buttonWrite]: props.isAuthorsList || props.isTextButton, [styles.isSubscribing]: isSubscribing() }} disabled={isSubscribing()} > - + - {t('Unfollow')} + + + {t('Unfollow')} + + @@ -177,8 +186,10 @@ export const AuthorCard = (props: AuthorCardProps) => { }} onClick={initChat} > - - {t('Write')} + + + + {t('Write')} diff --git a/src/components/Topic/Card.module.scss b/src/components/Topic/Card.module.scss index c6c76f91..f46fc1e2 100644 --- a/src/components/Topic/Card.module.scss +++ b/src/components/Topic/Card.module.scss @@ -18,14 +18,15 @@ margin-top: 0; } - .topicTitle { - margin-bottom: 0; + @include media-breakpoint-up(sm) { + .topicDescription { + margin-bottom: 0; + } } } .topicTitle { @include font-size(2.2rem); - font-weight: bold; margin-bottom: 1.2rem; margin-top: 0.5rem !important; @@ -50,9 +51,8 @@ .topicDescription { @include font-size(1.6rem); - color: #696969; - margin: 0 0 1.6rem; + margin: 0.5em 0 1.6rem; &.compact { font-size: medium; @@ -102,7 +102,7 @@ } .controlContainer { - @include media-breakpoint-up(md) { + @include media-breakpoint-up(sm) { text-align: right; } } @@ -124,4 +124,10 @@ .isSubscribed { background: #000; color: #fff; + transition: background-color 0.3s, color 0.3s; + + &:hover { + background: #fff; + color: #000; + } } diff --git a/src/components/Topic/Card.tsx b/src/components/Topic/Card.tsx index 98e7dcdc..bf5e8c46 100644 --- a/src/components/Topic/Card.tsx +++ b/src/components/Topic/Card.tsx @@ -21,6 +21,7 @@ interface TopicProps { isTopicInRow?: boolean iconButton?: boolean showPublications?: boolean + showDescription?: boolean } export const TopicCard = (props: TopicProps) => { @@ -56,12 +57,12 @@ export const TopicCard = (props: TopicProps) => {
-
+

{capitalize(props.topic.title || '')} @@ -75,7 +76,7 @@ export const TopicCard = (props: TopicProps) => {

- +
{
diff --git a/src/components/Views/AllAuthors.tsx b/src/components/Views/AllAuthors.tsx index 1113ca51..a0c1f58f 100644 --- a/src/components/Views/AllAuthors.tsx +++ b/src/components/Views/AllAuthors.tsx @@ -188,6 +188,7 @@ export const AllAuthorsView = (props: AllAuthorsViewProps) => { noSocialButtons={true} isAuthorsList={true} truncateBio={true} + isTextButton={true} />
diff --git a/src/components/Views/AllTopics.tsx b/src/components/Views/AllTopics.tsx index 71e5347e..e9ceb8e0 100644 --- a/src/components/Views/AllTopics.tsx +++ b/src/components/Views/AllTopics.tsx @@ -176,19 +176,24 @@ export const AllTopicsView = (props: AllTopicsViewProps) => { - - {(topic) => ( - <> - - - - )} - +
+
+ + {(topic) => ( + <> + + + + )} + +
+
limit() && searchParams().by !== 'title'}> diff --git a/src/components/Views/Author/Author.module.scss b/src/components/Views/Author/Author.module.scss index 864307ce..01264b2a 100644 --- a/src/components/Views/Author/Author.module.scss +++ b/src/components/Views/Author/Author.module.scss @@ -79,3 +79,11 @@ align-items: center; justify-content: center; } + +.subscriptions { + margin-top: -2em; +} + +.authorContainer { + margin-top: 3.2rem; +} diff --git a/src/components/Views/Author/Author.tsx b/src/components/Views/Author/Author.tsx index 5082417d..f67ee3d6 100644 --- a/src/components/Views/Author/Author.tsx +++ b/src/components/Views/Author/Author.tsx @@ -242,7 +242,7 @@ export const AuthorView = (props: AuthorProps) => {
-
+
{ > {(subscription: Author | Topic) => ( -
+
{isAuthor(subscription) ? ( - +
+ +
) : ( - + )}
)} diff --git a/src/components/_shared/Stat.module.scss b/src/components/_shared/Stat.module.scss index 5e44af00..3cf0ecbb 100644 --- a/src/components/_shared/Stat.module.scss +++ b/src/components/_shared/Stat.module.scss @@ -1,13 +1,16 @@ .statMetrics { @include font-size(1.7rem); - color: #9fa1a7; display: flex; - margin: 0.5em 0 1em; + margin: 0 0 1em; @include media-breakpoint-down(md) { flex-wrap: wrap; } + + @include media-breakpoint-down(sm) { + margin-top: 0.5em; + } } .statMetricsItem {