Skip to content

🎨 menu vertical #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
laem wants to merge 3 commits into
base: master
Choose a base branch
from
Open

🎨 menu vertical #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0df9ee8
Test menu vertical sur mobile
laem Feb 4, 2021
ced0c2d
Menu vertical propre
laem Feb 4, 2021
afc0cfa
Menu collé à droite sur mobile
laem Feb 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 51 additions & 43 deletions App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,49 +39,57 @@ const Container = () => (
<Router>
<Nav />

<Switch>
<Route path="/france">
<France />
</Route>
<Route path="/en/france">
<FranceEn />
</Route>
<Route path="/québec">
<Québec />
</Route>
<Route path="/en/québec">
<QuébecEn />
</Route>
<Route path="/sidewalks">
<Sidewalks />
</Route>
<Route path="/en/">
<AccueilEn />
</Route>
<Route path="/blog">
<Blog />
</Route>
{/* Pour la migration vers le nouveau site*/}
<UtmFriendlyRedirect from="/articles/:id" to="/blog/:id" />
<Route path="/communs">
<Communs />
</Route>
<Route path="/ecosystem">
<Ecosystem />
</Route>
<route path="/participer">
<Participer />
</route>
<route path="/a-propos">
<About />
</route>
<route path="/événements">
<Événéments />
</route>
<Route path="/">
<Accueil />
</Route>
</Switch>
<div
css={`
@media (max-width: 800px) {
width: 90%;
}
`}
>
<Switch>
<Route path="/france">
<France />
</Route>
<Route path="/en/france">
<FranceEn />
</Route>
<Route path="/québec">
<Québec />
</Route>
<Route path="/en/québec">
<QuébecEn />
</Route>
<Route path="/sidewalks">
<Sidewalks />
</Route>
<Route path="/en/">
<AccueilEn />
</Route>
<Route path="/blog">
<Blog />
</Route>
{/* Pour la migration vers le nouveau site*/}
<UtmFriendlyRedirect from="/articles/:id" to="/blog/:id" />
<Route path="/communs">
<Communs />
</Route>
<Route path="/ecosystem">
<Ecosystem />
</Route>
<route path="/participer">
<Participer />
</route>
<route path="/a-propos">
<About />
</route>
<route path="/événements">
<Événéments />
</route>
<Route path="/">
<Accueil />
</Route>
</Switch>
</div>
</Router>
</div>
)
Expand Down
84 changes: 43 additions & 41 deletions Nav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,17 @@ import { useLocation } from 'react-router-dom'

export default () => {
let location = useLocation()
const [open, setOpen] = useState(false)
return (
<nav
css={`
font-weight: bold;
margin: 0 auto;
width: 100%;
padding: 0.6rem 0;
box-shadow: var(--box-shadow) var(--color-bg-secondary);
border-bottom: 1px solid var(--color-bg-secondary);
@media (min-width: 800px) {
box-shadow: var(--box-shadow) var(--color-bg-secondary);
border-bottom: 1px solid var(--color-bg-secondary);
}
display: flex;
align-items: center;
justify-content: center;
Expand All @@ -28,14 +29,14 @@ export default () => {
display: flex;
list-style: none;
padding: 0;
margin: 0;
}
ul > li {
display: inline-block;
margin: 0.4rem 0.6rem;
position: relative;
text-align: left;
text-transform: uppercase;
font-size: 110%;
}
/* Nav Dropdown */
ul li:hover ul {
Expand All @@ -58,13 +59,38 @@ export default () => {
@media (max-width: 800px) {
justify-content: space-evenly;

img {
width: 3rem;
}
ul {
flex-direction: column;
position: fixed;
z-index: 1000;
align-item: end;
${open ? 'display: flex' : 'display: none'}
right: -1px;
top: 0;
width: 3rem;
height: 100vh;
}
ul li {
writing-mode: vertical-rl;
text-orientation: mixed;
background: grey;
margin: 0;
padding: 2rem 0.7rem;
flex-grow: 1;
}
li:nth-child(0) {
background: #e4e4e4;
}
li:nth-child(1) {
background: #c4c4c4;
}
li:nth-child(2) {
background: #a3a3a3;
}
li:nth-child(3) {
background: #aaa;
}
img.emoji {
vertical-align: 0;
}
}
`}
Expand All @@ -80,52 +106,24 @@ export default () => {
<li>
<Link to="/communs">Communs</Link>
</li>
<li>
<Link to="/ecosystem">Écosystème</Link>
</li>
<li>
<Link to="/événements">Événements</Link>
<Notifications count={2} />
</li>
<li>
<Link to="/blog">Blog</Link>
<Notifications count={2} />
</li>
<li
css={`
padding: 0.2rem 0.3rem;
a {
color: ${colors.bleu} !important;
color: yellow;
}
`}
>
<Link to="/participer">Participer</Link>
</li>
<li>
<Link to="/blog">Blog</Link>
<Notifications count={2} />
</li>
<li>
<LangSwitch />
</li>
</ul>
<div
title={open ? 'Fermer le menu' : 'Ouvrir le menu'}
css={`
cursor: pointer;
border: none;
padding: 0;
margin: 0;
svg {
width: 2rem;
height: 2rem;
}

display: none;
@media (max-width: 800px) {
display: block;
}
`}
onClick={() => setOpen(!open)}
>
{open ? <CloseMenuIcon /> : <MenuIcon />}
</div>
</nav>
)
}
Expand All @@ -141,6 +139,10 @@ const Notifications = ({ count }) => (
font-size: 60%;
padding: 0.2rem 0.6rem;
position: relative;

@media (max-width: 800px) {
display: none;
}
`}
>
{count}
Expand Down
7 changes: 6 additions & 1 deletion pages/Accueil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@ export default () => {
<header
css={`
> section {
height: 65vh;
height: 75vh;
@media (max-width: 800px) {
height: 65vh;
padding: 0 1rem;
}

display: flex;
flex-direction: column;
justify-content: center;
Expand Down