Merge branch 'dev' of https://github.com/Discours/discoursio-webapp into nobootstrap
This commit is contained in:
commit
677c49011b
|
@ -173,34 +173,34 @@ export const Header = (props: Props) => {
|
||||||
<ul class="view-switcher">
|
<ul class="view-switcher">
|
||||||
<Link
|
<Link
|
||||||
onMouseOver={() => toggleSubnavigation(true, setIsZineVisible)}
|
onMouseOver={() => toggleSubnavigation(true, setIsZineVisible)}
|
||||||
onMouseOut={(event?: MouseEvent) => hideSubnavigation(event, 0)}
|
onMouseOut={(event?: MouseEvent) => hideSubnavigation(event)}
|
||||||
href="/"
|
href="/"
|
||||||
active={isZineVisible()}
|
active={isZineVisible()}
|
||||||
body={t('Journal')}
|
body={t('Journal')}
|
||||||
/>
|
/>
|
||||||
<Link
|
<Link
|
||||||
onMouseOver={() => toggleSubnavigation(true, setIsFeedVisible)}
|
onMouseOver={() => toggleSubnavigation(true, setIsFeedVisible)}
|
||||||
onMouseOut={(event?: MouseEvent) => hideSubnavigation(event, 0)}
|
onMouseOut={(event?: MouseEvent) => hideSubnavigation(event)}
|
||||||
href="/feed"
|
href="/feed"
|
||||||
active={isFeedVisible()}
|
active={isFeedVisible()}
|
||||||
body={t('Feed')}
|
body={t('Feed')}
|
||||||
/>
|
/>
|
||||||
<Link
|
<Link
|
||||||
onMouseOver={() => toggleSubnavigation(true, setIsTopicsVisible)}
|
onMouseOver={() => toggleSubnavigation(true, setIsTopicsVisible)}
|
||||||
onMouseOut={(event?: MouseEvent) => hideSubnavigation(event, 0)}
|
onMouseOut={(event?: MouseEvent) => hideSubnavigation(event)}
|
||||||
href="/topic"
|
href="/topic"
|
||||||
active={isTopicsVisible()}
|
active={isTopicsVisible()}
|
||||||
body={t('Topics')}
|
body={t('Topics')}
|
||||||
/>
|
/>
|
||||||
<Link
|
<Link
|
||||||
onMouseOver={(event?: MouseEvent) => hideSubnavigation(event, 0)}
|
onMouseOver={(event?: MouseEvent) => hideSubnavigation(event, 0)}
|
||||||
onMouseOut={(event?: MouseEvent) => hideSubnavigation(event, 0)}
|
onMouseOut={(event?: MouseEvent) => hideSubnavigation(event)}
|
||||||
href="/author"
|
href="/author"
|
||||||
body={t('Authors')}
|
body={t('Authors')}
|
||||||
/>
|
/>
|
||||||
<Link
|
<Link
|
||||||
onMouseOver={() => toggleSubnavigation(true, setIsKnowledgeBaseVisible)}
|
onMouseOver={() => toggleSubnavigation(true, setIsKnowledgeBaseVisible)}
|
||||||
onMouseOut={(event?: MouseEvent) => hideSubnavigation(event, 0)}
|
onMouseOut={(event?: MouseEvent) => hideSubnavigation(event)}
|
||||||
href="/guide"
|
href="/guide"
|
||||||
body={t('Knowledge base')}
|
body={t('Knowledge base')}
|
||||||
active={isKnowledgeBaseVisible()}
|
active={isKnowledgeBaseVisible()}
|
||||||
|
|
|
@ -41,7 +41,13 @@ export const ArticleCardSwiper = (props: Props) => {
|
||||||
})}
|
})}
|
||||||
>
|
>
|
||||||
<Show when={props.title}>
|
<Show when={props.title}>
|
||||||
|
<div class="wide-container">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-12">
|
||||||
<h2 class={styles.sliderTitle}>{props.title}</h2>
|
<h2 class={styles.sliderTitle}>{props.title}</h2>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</Show>
|
</Show>
|
||||||
<div class={styles.container}>
|
<div class={styles.container}>
|
||||||
<Show when={props.slides?.length > 0}>
|
<Show when={props.slides?.length > 0}>
|
||||||
|
|
|
@ -743,13 +743,14 @@ figure {
|
||||||
}
|
}
|
||||||
|
|
||||||
.main-content {
|
.main-content {
|
||||||
|
flex: 1 100%;
|
||||||
|
min-height: 90vh;
|
||||||
|
padding-top: 80px;
|
||||||
|
position: relative;
|
||||||
|
|
||||||
@include media-breakpoint-up(lg) {
|
@include media-breakpoint-up(lg) {
|
||||||
padding-top: 130px;
|
padding-top: 130px;
|
||||||
}
|
}
|
||||||
|
|
||||||
flex: 1 100%;
|
|
||||||
min-height: 90vh;
|
|
||||||
position: relative;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.main-content--no-padding {
|
.main-content--no-padding {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user