discours.io/webapp
5
0
Fork 0
Code Issues Pull Requests Actions Projects Wiki Activity

postmerge

Browse Source
This commit is contained in:
Untone 2024-05-04 22:17:36 +03:00
parent 21c216d19c
commit 9277d652e9
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Author/AuthorCard/AuthorCard.tsx
View File

@ -312,7 +312,7 @@ export const AuthorCard = (props: Props) => {
<For each={authorSubs()}> <For each={authorSubs()}>
{(subscription) => {(subscription) =>
isAuthor(subscription) ? ( isAuthor(subscription) ? (
<AuthorBadge author={subscription} subscriptionsMode={true} /> <AuthorBadge author={subscription} />
) : ( ) : (
<TopicBadge topic={subscription} subscriptionsMode={true} /> <TopicBadge topic={subscription} subscriptionsMode={true} />
) )

7
src/components/Nav/Header/Header.tsx
View File

@ -59,7 +59,6 @@ export const Header = (props: Props) => {
const [isTopicsVisible, setIsTopicsVisible] = createSignal(false) const [isTopicsVisible, setIsTopicsVisible] = createSignal(false)
const [isZineVisible, setIsZineVisible] = createSignal(false) const [isZineVisible, setIsZineVisible] = createSignal(false)
const [isFeedVisible, setIsFeedVisible] = createSignal(false) const [isFeedVisible, setIsFeedVisible] = createSignal(false)
const { isAuthenticated } = useSession()
const toggleFixed = () => setFixed(!fixed()) const toggleFixed = () => setFixed(!fixed())
@ -331,11 +330,7 @@ export const Header = (props: Props) => {
</div> </div>
<HeaderAuth setIsProfilePopupVisible={setIsProfilePopupVisible} /> <HeaderAuth setIsProfilePopupVisible={setIsProfilePopupVisible} />
<Show when={props.title}> <Show when={props.title}>
<div <div class={clsx(styles.articleControls, 'col-auto')}>
class={clsx(styles.articleControls, 'col-auto', {
[styles.articleControlsAuthorized]: isAuthenticated(),
})}
>
<SharePopup <SharePopup
title={props.title} title={props.title}
imageUrl={props.cover} imageUrl={props.cover}

2
src/components/Topic/TopicBadge/TopicBadge.tsx
View File

@ -48,7 +48,7 @@ export const TopicBadge = (props: Props) => {
lang() === 'en' ? capitalize(props.topic.slug.replaceAll('-', ' ')) : props.topic.title lang() === 'en' ? capitalize(props.topic.slug.replaceAll('-', ' ')) : props.topic.title
return ( return (
<div class={clsx(styles.TopicBadge, { [styles.TopicBadgeSubscriptionsMode]: props.subscriptionsMode })}> <div class={clsx(styles.TopicBadge, props.subscriptionsMode)}>
<div class={styles.content}> <div class={styles.content}>
<div class={styles.basicInfo}> <div class={styles.basicInfo}>
<Show when={props.subscriptionsMode}> <Show when={props.subscriptionsMode}>