Merge branch 'dev' of github.com:Discours/discoursio-webapp into dev

This commit is contained in:
tonyrewin 2022-12-01 12:53:43 +03:00
commit 1831c9b61f
8 changed files with 34 additions and 21 deletions

View File

@ -246,6 +246,8 @@
} }
.authorsListItem { .authorsListItem {
margin-bottom: 1em !important;
.authorName { .authorName {
@include font-size(2.2rem); @include font-size(2.2rem);

View File

@ -9,6 +9,7 @@ import { locale } from '../../stores/ui'
import { follow, unfollow } from '../../stores/zine/common' import { follow, unfollow } from '../../stores/zine/common'
import { clsx } from 'clsx' import { clsx } from 'clsx'
import { useSession } from '../../context/session' import { useSession } from '../../context/session'
import { StatMetrics } from '../_shared/StatMetrics'
interface AuthorCardProps { interface AuthorCardProps {
caption?: string caption?: string
@ -68,7 +69,7 @@ export const AuthorCard = (props: AuthorCardProps) => {
<div class={styles.authorName}>{name()}</div> <div class={styles.authorName}>{name()}</div>
</Show> </Show>
<Show when={!props.hideDescription}> <Show when={!props.hideDescription && props.author.bio}>
{props.isAuthorsList} {props.isAuthorsList}
<div <div
class={styles.authorAbout} class={styles.authorAbout}
@ -76,6 +77,10 @@ export const AuthorCard = (props: AuthorCardProps) => {
innerHTML={props.author.bio} innerHTML={props.author.bio}
></div> ></div>
</Show> </Show>
<Show when={props.author.stat}>
<StatMetrics fields={['shouts', 'followers', 'comments']} stat={props.author.stat} />
</Show>
</div> </div>
<Show when={canFollow()}> <Show when={canFollow()}>

View File

@ -23,7 +23,7 @@
.icon { .icon {
height: 1.2em; height: 1.2em;
width: 1.2em; width: 100%;
} }
} }

View File

@ -181,7 +181,8 @@ export const AllAuthorsView = (props: AllAuthorsViewProps) => {
<Show when={searchParams().by && searchParams().by !== 'title'}> <Show when={searchParams().by && searchParams().by !== 'title'}>
<For each={filterResults().slice(0, limit())}> <For each={filterResults().slice(0, limit())}>
{(author) => ( {(author) => (
<> <div class="row">
<div class="col-lg-10 col-xl-9">
<AuthorCard <AuthorCard
author={author} author={author}
hasLink={true} hasLink={true}
@ -190,8 +191,8 @@ export const AllAuthorsView = (props: AllAuthorsViewProps) => {
isAuthorsList={true} isAuthorsList={true}
truncateBio={true} truncateBio={true}
/> />
<StatMetrics fields={['shouts', 'followers', 'comments']} stat={author.stat} /> </div>
</> </div>
)} )}
</For> </For>
</Show> </Show>

View File

@ -5,9 +5,16 @@
input { input {
border: none; border: none;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
box-shadow: 0 0 0 #ccc;
font-family: inherit; font-family: inherit;
font-size: inherit; font-size: inherit;
outline: none;
transition: box-shadow 0.3s;
width: 100%; width: 100%;
&:focus {
box-shadow: 0 3px 0 #ccc;
}
} }
label { label {

View File

@ -14,13 +14,7 @@ export const SearchField = (props: SearchFieldProps) => {
<label for="search-field"> <label for="search-field">
<Icon name="search" class={styles.icon} /> <Icon name="search" class={styles.icon} />
</label> </label>
<input <input id="search-field" type="text" onInput={handleInputChange} placeholder={t('Search')} />
id="search-field"
type="text"
class="search-input"
onInput={handleInputChange}
placeholder={t('Search')}
/>
</div> </div>
) )
} }

View File

@ -3,7 +3,7 @@
color: #9fa1a7; color: #9fa1a7;
display: flex; display: flex;
margin-bottom: 1em; margin: 0.5em 0 1em;
@include media-breakpoint-down(md) { @include media-breakpoint-down(md) {
flex-wrap: wrap; flex-wrap: wrap;

View File

@ -72,3 +72,7 @@
margin-left: 0.5em; margin-left: 0.5em;
vertical-align: super; vertical-align: super;
} }
.viewSwitcher {
margin-bottom: 2rem;
}