Merge pull request #4 from Discours/navigation
WIP: sticky main navigation block
This commit is contained in:
commit
8581d66715
|
@ -1,13 +1,31 @@
|
||||||
header {
|
header {
|
||||||
|
background: #fff;
|
||||||
margin-bottom: 2.2rem;
|
margin-bottom: 2.2rem;
|
||||||
|
position: fixed;
|
||||||
|
top: 0;
|
||||||
|
width: 100%;
|
||||||
|
z-index: 10;
|
||||||
|
|
||||||
.wide-container {
|
.wide-container {
|
||||||
|
background: #fff;
|
||||||
|
|
||||||
@include media-breakpoint-down(sm) {
|
@include media-breakpoint-down(sm) {
|
||||||
padding: 0 divide($container-padding-x, 2);
|
padding: 0 divide($container-padding-x, 2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.header--scrolled-bottom,
|
||||||
|
.header--scrolled-top {
|
||||||
|
.main-logo {
|
||||||
|
height: 56px;
|
||||||
|
|
||||||
|
img {
|
||||||
|
height: 20px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.header__inner {
|
.header__inner {
|
||||||
background: #fff;
|
background: #fff;
|
||||||
border-bottom: 4px solid #000;
|
border-bottom: 4px solid #000;
|
||||||
|
@ -35,8 +53,9 @@ header {
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
height: 70px;
|
height: 70px;
|
||||||
padding: 0 $container-padding-x 0 0;
|
padding: 0 $container-padding-x 0 0;
|
||||||
text-align: center;
|
|
||||||
position: relative;
|
position: relative;
|
||||||
|
transition: height 0.2s;
|
||||||
|
text-align: center;
|
||||||
z-index: 9;
|
z-index: 9;
|
||||||
|
|
||||||
@include media-breakpoint-up(lg) {
|
@include media-breakpoint-up(lg) {
|
||||||
|
@ -44,6 +63,10 @@ header {
|
||||||
}
|
}
|
||||||
|
|
||||||
img {
|
img {
|
||||||
|
height: 32px;
|
||||||
|
object-fit: contain;
|
||||||
|
object-position: left;
|
||||||
|
transition: height 0.2s;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
width: 100px;
|
width: 100px;
|
||||||
|
|
||||||
|
@ -79,12 +102,16 @@ nav {
|
||||||
}
|
}
|
||||||
|
|
||||||
.main-navigation {
|
.main-navigation {
|
||||||
display: inline-flex;
|
position: relative;
|
||||||
@include font-size(1.7rem);
|
@include font-size(1.7rem);
|
||||||
|
|
||||||
|
ul {
|
||||||
|
display: inline-flex;
|
||||||
list-style: none;
|
list-style: none;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
|
opacity: 1;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
|
transition: opacity 0.3s;
|
||||||
|
|
||||||
@include media-breakpoint-down(md) {
|
@include media-breakpoint-down(md) {
|
||||||
background: #fff;
|
background: #fff;
|
||||||
|
@ -108,13 +135,20 @@ nav {
|
||||||
padding: divide($container-padding-x, 2);
|
padding: divide($container-padding-x, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.header--scrolled-bottom & {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
&.fixed {
|
&.fixed {
|
||||||
|
ul {
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
|
|
||||||
@include media-breakpoint-down(lg) {
|
@include media-breakpoint-down(lg) {
|
||||||
display: block !important;
|
display: block !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
li {
|
li {
|
||||||
margin-right: 2.4rem;
|
margin-right: 2.4rem;
|
||||||
|
@ -127,8 +161,8 @@ nav {
|
||||||
.selected a {
|
.selected a {
|
||||||
border-bottom: 2px solid;
|
border-bottom: 2px solid;
|
||||||
color: #000;
|
color: #000;
|
||||||
pointer-events: none;
|
|
||||||
cursor: default;
|
cursor: default;
|
||||||
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -208,3 +242,24 @@ nav {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.article-header {
|
||||||
|
@include font-size(1.4rem);
|
||||||
|
|
||||||
|
left: 0;
|
||||||
|
margin: 0.2em;
|
||||||
|
opacity: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
position: absolute;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
transition: opacity 0.3s, z-index 0s 0.3s;
|
||||||
|
white-space: nowrap;
|
||||||
|
width: 100%;
|
||||||
|
z-index: -1;
|
||||||
|
|
||||||
|
.header--scrolled-bottom & {
|
||||||
|
transition: opacity 0.3s;
|
||||||
|
opacity: 1;
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { For, Show, createSignal, createMemo, createEffect } from 'solid-js'
|
import { For, Show, createSignal, createMemo, createEffect, onMount, onCleanup } from 'solid-js'
|
||||||
import Private from './Private'
|
import Private from './Private'
|
||||||
import Notifications from './Notifications'
|
import Notifications from './Notifications'
|
||||||
import Icon from './Icon'
|
import Icon from './Icon'
|
||||||
|
@ -20,6 +20,8 @@ const resources = [
|
||||||
|
|
||||||
export const Header = () => {
|
export const Header = () => {
|
||||||
// signals
|
// signals
|
||||||
|
const [getIsScrollingBottom, setIsScrollingBottom] = createSignal(false)
|
||||||
|
const [getIsScrolled, setIsScrolled] = createSignal(false)
|
||||||
const [fixed, setFixed] = createSignal(false)
|
const [fixed, setFixed] = createSignal(false)
|
||||||
const [visibleWarnings, setVisibleWarnings] = createSignal(false)
|
const [visibleWarnings, setVisibleWarnings] = createSignal(false)
|
||||||
// stores
|
// stores
|
||||||
|
@ -58,8 +60,28 @@ export const Header = () => {
|
||||||
handleClientRouteLinkClick(ev)
|
handleClientRouteLinkClick(ev)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onMount(() => {
|
||||||
|
let scrollTop = window.scrollY
|
||||||
|
|
||||||
|
const handleScroll = () => {
|
||||||
|
setIsScrollingBottom(window.scrollY > scrollTop)
|
||||||
|
setIsScrolled(window.scrollY > 0)
|
||||||
|
scrollTop = window.scrollY
|
||||||
|
}
|
||||||
|
|
||||||
|
window.addEventListener('scroll', handleScroll, { passive: true })
|
||||||
|
onCleanup(() => {
|
||||||
|
window.removeEventListener('scroll', handleScroll)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<header>
|
<header
|
||||||
|
classList={{
|
||||||
|
['header--scrolled-top']: !getIsScrollingBottom() && getIsScrolled(),
|
||||||
|
['header--scrolled-bottom']: getIsScrollingBottom() && getIsScrolled()
|
||||||
|
}}
|
||||||
|
>
|
||||||
<Modal name="auth">
|
<Modal name="auth">
|
||||||
<AuthModal />
|
<AuthModal />
|
||||||
</Modal>
|
</Modal>
|
||||||
|
@ -70,7 +92,14 @@ export const Header = () => {
|
||||||
<img src="/logo.svg" alt={t('Discours')} />
|
<img src="/logo.svg" alt={t('Discours')} />
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<ul class="col main-navigation text-xl inline-flex" classList={{ fixed: fixed() }}>
|
<div class="col main-navigation">
|
||||||
|
{/*FIXME article header*/}
|
||||||
|
<div class="article-header">
|
||||||
|
Дискурс — независимый художественно-аналитический журнал с горизонтальной редакцией,
|
||||||
|
основанный на принципах свободы слова, прямой демократии и совместного редактирования.
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<ul class="text-xl inline-flex" classList={{ fixed: fixed() }}>
|
||||||
<For each={resources}>
|
<For each={resources}>
|
||||||
{(r: { href: string; name: string }) => (
|
{(r: { href: string; name: string }) => (
|
||||||
<li classList={{ selected: r.href === subpath() }}>
|
<li classList={{ selected: r.href === subpath() }}>
|
||||||
|
@ -81,6 +110,7 @@ export const Header = () => {
|
||||||
)}
|
)}
|
||||||
</For>
|
</For>
|
||||||
</ul>
|
</ul>
|
||||||
|
</div>
|
||||||
<div class="usernav">
|
<div class="usernav">
|
||||||
<div class="usercontrol col">
|
<div class="usercontrol col">
|
||||||
<div class="usercontrol__item">
|
<div class="usercontrol__item">
|
||||||
|
|
|
@ -1,7 +1,11 @@
|
||||||
.subnavigation {
|
.subnavigation {
|
||||||
@include font-size(1.5rem);
|
@include font-size(1.5rem);
|
||||||
|
|
||||||
margin-bottom: 2.4rem;
|
height: 3em;
|
||||||
|
line-height: 3em;
|
||||||
|
margin-bottom: 1.2rem !important;
|
||||||
|
overflow: hidden;
|
||||||
|
position: relative;
|
||||||
|
|
||||||
@include media-breakpoint-down(sm) {
|
@include media-breakpoint-down(sm) {
|
||||||
padding: 0 divide($container-padding-x, 2);
|
padding: 0 divide($container-padding-x, 2);
|
||||||
|
@ -10,6 +14,7 @@
|
||||||
.topics {
|
.topics {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
|
justify-content: space-between;
|
||||||
list-style: none;
|
list-style: none;
|
||||||
margin-right: 2.2rem;
|
margin-right: 2.2rem;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
|
|
|
@ -23,7 +23,7 @@ const locale = useStore(langstore)
|
||||||
<title>{t('Discours')}</title>
|
<title>{t('Discours')}</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<Header />
|
<Header client:load />
|
||||||
<main class="main-content">
|
<main class="main-content">
|
||||||
<Suspense>
|
<Suspense>
|
||||||
<slot />
|
<slot />
|
||||||
|
|
|
@ -33,7 +33,7 @@ body {
|
||||||
font-family: Muller, Arial, Helvetica, sans-serif;
|
font-family: Muller, Arial, Helvetica, sans-serif;
|
||||||
font-size: 2rem;
|
font-size: 2rem;
|
||||||
line-height: 1.4;
|
line-height: 1.4;
|
||||||
height: 100%;
|
min-height: 100%;
|
||||||
text-size-adjust: 100%;
|
text-size-adjust: 100%;
|
||||||
|
|
||||||
&.fixed {
|
&.fixed {
|
||||||
|
@ -533,6 +533,7 @@ figcaption {
|
||||||
|
|
||||||
.main-content {
|
.main-content {
|
||||||
flex: 1 100%;
|
flex: 1 100%;
|
||||||
|
padding-top: 100px;
|
||||||
transition: all 1s ease;
|
transition: all 1s ease;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user