Skip to content
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

new design and logic for the menu #1590 #1568

Merged
merged 34 commits into from
Oct 29, 2024
Merged

new design and logic for the menu #1590 #1568

Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
67010e7
feat: drop dropi
bjohansebas Aug 9, 2024
f3c78f3
fix theme position
bjohansebas Aug 10, 2024
0bb30ac
Merge branch 'gh-pages' into improve-menu-list
bjohansebas Sep 3, 2024
9bb13ee
merge menu.css to style.css
bjohansebas Sep 3, 2024
c036839
remove unused class
bjohansebas Sep 3, 2024
ac65ffc
improve menu styles
bjohansebas Sep 3, 2024
e8a80a4
fix dark mode
bjohansebas Sep 3, 2024
2a85519
remove padding in logo
bjohansebas Sep 4, 2024
bd0061d
add support lts link
bjohansebas Sep 4, 2024
cb49915
adapt headers in other langs
bjohansebas Sep 4, 2024
c5e1bb7
adapt other langs
bjohansebas Sep 4, 2024
4036632
revert remove ismobile.js
bjohansebas Sep 4, 2024
5c795e4
improve styles
bjohansebas Sep 4, 2024
5cbc2cc
fix dark mode subcontent
bjohansebas Sep 4, 2024
ef7b17c
fix translate subcontent
bjohansebas Sep 4, 2024
0d88b29
fix dark mode in mobile
bjohansebas Sep 4, 2024
4b599e0
fix nav space
bjohansebas Sep 7, 2024
d92d1fe
fix errors in chrome
bjohansebas Sep 7, 2024
15fccd3
small styles
bjohansebas Sep 7, 2024
146c049
Merge branch 'gh-pages' into improve-menu-list
bjohansebas Sep 8, 2024
f3e40af
add optional chaining
bjohansebas Sep 10, 2024
130e6d6
small changes
bjohansebas Sep 10, 2024
b338043
improve submenu logic
bjohansebas Sep 10, 2024
4512654
remove some !important
bjohansebas Sep 10, 2024
356e5cb
remove some !important
bjohansebas Sep 10, 2024
365ca72
fix hover
bjohansebas Sep 10, 2024
8e57fd0
Revert "add optional chaining"
bjohansebas Sep 11, 2024
f8943db
fix mobile detect
bjohansebas Sep 11, 2024
524825a
small fix
bjohansebas Sep 11, 2024
bb9c182
Merge branch 'gh-pages' into improve-menu-list
bjohansebas Oct 15, 2024
9778d9a
remove $
bjohansebas Oct 18, 2024
15445c8
update style.css
bjohansebas Oct 22, 2024
4df50ca
improve layout
bjohansebas Oct 23, 2024
dff6551
Merge branch 'gh-pages' into improve-menu-list
bjohansebas Oct 29, 2024
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
5 changes: 2 additions & 3 deletions _includes/head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<script src="/js/theme.js"></script>
<link rel="stylesheet" href="/css/dark-theme.css?_={{ site.time | date: '%s' }}">
<link rel="stylesheet" href="/css/style.css?_={{ site.time | date: '%s' }}">
<link rel="stylesheet" href="/css/dropit.css">
<link rel="stylesheet" href="/css/prism.css">
<link rel="stylesheet" href="/css/font-awesome.min.css">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700&amp;amp;subset=latin,latin-ext">
Expand All @@ -32,8 +31,8 @@
<script data-cfasync="false" src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script data-cfasync="false" src="/js/ismobile.js"></script>
<script data-cfasync="false" src="/js/app.js"></script>
<script data-cfasync="false" src="/js/retina.js"></script>
<script data-cfasync="false" src="/js/dropit.js"></script>
<script data-cfasync="false" defer src="/js/menu.js"></script>
<script data-cfasync="false" src="/js/retina.js"></script>
<script data-cfasync="false" src="/js/prism.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" />

Expand Down
49 changes: 16 additions & 33 deletions _includes/header/header-de.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@
<input id="q" placeholder="🔎 search">
<ul id="navmenu">
<li><a href="/{{ page.lang }}/" id="home-menu"{% if page.menu == 'home' %} class="active"{% endif %}>Home</a></li>
<li>
<ul id="getting-started-menu" class="menu">
<li><a href="/{{ page.lang }}/starter/installing.html"{% if page.menu == 'starter' %} class="active"{% endif %}>Einführung</a>
<ul>
<li id="getting-started-menu" class="submenu">
<a href="/{{ page.lang }}/starter/installing.html"{% if page.menu == 'starter' %} class="active"{% endif %}>Einführung</a>
<ul class="submenu-content">
<li>
<a href="/{{ page.lang }}/starter/installing.html">
Installation
Expand Down Expand Up @@ -40,15 +39,12 @@
<li>
<a href="/{{ page.lang }}/starter/faq.html">
Häufig gestellte Fragen</a>
</li>
</li>
</ul>
</li>
</ul>
</li>
<li>
<ul id="guide-menu" class="menu">
<li><a href="/{{ page.lang }}/guide/routing.html"{% if page.menu == 'guide' %} class="active"{% endif %}>Leitfaden</a>
<ul>
<li id="guide-menu" class="submenu">
<a href="/{{ page.lang }}/guide/routing.html"{% if page.menu == 'guide' %} class="active"{% endif %}>Leitfaden</a>
<ul class="submenu-content">
<li><a href="/{{ page.lang }}/guide/routing.html">Routing</a>
</li>
<li><a href="/{{ page.lang }}/guide/writing-middleware.html">Middleware schreiben</a>
Expand All @@ -70,13 +66,10 @@
<li><a href="/{{ page.lang }}/guide/database-integration.html">Datenbankintegration</a>
</li>
</ul>
</li>
</ul>
</li>
<li>
<ul id="application-menu" class="menu">
<li><a href="/{{ page.lang }}/4x/api.html"{% if page.menu == 'api' %} class="active"{% endif %}>API-Referenz</a>
<ul>
<li id="application-menu" class="submenu">
<a href="/{{ page.lang }}/4x/api.html"{% if page.menu == 'api' %} class="active"{% endif %}>API-Referenz</a>
<ul class="submenu-content">
<li><a href="/{{ page.lang }}/5x/api.html">5.x</a>
</li>
<li><a href="/{{ page.lang }}/4x/api.html">4.x</a>
Expand All @@ -86,40 +79,30 @@
<li><a href="/2x/">2.x (veraltet)</a>
</li>
</ul>
</li>
</ul>
</li>
<li>
<ul id="advanced-topics-menu" class="menu">
<li><a href="/{{ page.lang }}/advanced/developing-template-engines.html"{% if page.menu == 'advanced' %} class="active"{% endif %}>Themen für Fortgeschrittene</a>
<ul>
<li id="advanced-topics-menu" class="submenu">
<a href="/{{ page.lang }}/advanced/developing-template-engines.html"{% if page.menu == 'advanced' %} class="active"{% endif %}>Themen für Fortgeschrittene</a>
<ul class="submenu-content">
<li><a href="/{{ page.lang }}/advanced/developing-template-engines.html">Template-Engines</a>
</li>

<li><a href="/{{ page.lang }}/advanced/security-updates.html">Sicherheitsupdates</a>
</li>
<li><a href="/{{ page.lang }}/advanced/best-practice-security.html">Sicherheitsspezifische Best Practices</a>
</li>
<li><a href="/{{ page.lang }}/advanced/best-practice-performance.html">Leistungsspezifische Best Practices</a>
</li>

</ul>
</li>
</ul>
</li>
<li>
<ul id="resources-menu" class="menu">
<li><a href="/{{ page.lang }}/resources/glossary.html"{% if page.menu == 'resources' %} class="active"{% endif %}>Ressourcen</a>
<ul>
<li id="resources-menu" class="submenu">
<a href="/{{ page.lang }}/resources/glossary.html"{% if page.menu == 'resources' %} class="active"{% endif %}>Ressourcen</a>
<ul class="submenu-content">
<li><a href="/{{ page.lang }}/resources/glossary.html">Glossar</a>
</li>
<li><a href="/{{ page.lang }}/resources/middleware.html">Middleware</a>
</li>
<li><a href="/{{ page.lang }}/resources/community.html">Community</a>
</li>
</ul>
</li>
</ul>
</li>
</ul>
<div id="theme-icon-container" class="theme-toggle default-theme" title="toggle darkmode">
Expand Down
67 changes: 19 additions & 48 deletions _includes/header/header-en.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@
<input id="q" placeholder="🔎 search">
<ul id="navmenu">
<li><a href="/" id="home-menu"{% if page.menu == 'home' %} class="active"{% endif %}>Home</a></li>
<li>
<ul id="getting-started-menu" class="menu">
<li><a href="/{{ page.lang }}/starter/installing.html"{% if page.menu == 'starter' %} class="active"{% endif %}>Getting started</a>
<ul>
<li id="getting-started-menu" class="submenu">
<a href="/{{ page.lang }}/starter/installing.html"{% if page.menu == 'starter' %} class="active"{% endif %}>Getting started</a>
<ul class="submenu-content">
<li>
<a href="/{{ page.lang }}/starter/installing.html">
Installing
Expand Down Expand Up @@ -48,13 +47,10 @@
</a>
</li>
</ul>
</li>
</ul>
</li>
<li>
<ul id="guide-menu" class="menu">
<li><a href="/{{ page.lang }}/guide/routing.html"{% if page.menu == 'guide' %} class="active"{% endif %}>Guide</a>
<ul>
<li id="guide-menu" class="submenu">
<a href="/{{ page.lang }}/guide/routing.html"{% if page.menu == 'guide' %} class="active"{% endif %}>Guide</a>
<ul class="submenu-content">
<li><a href="/{{ page.lang }}/guide/routing.html">Routing</a>
</li>
<li><a href="/{{ page.lang }}/guide/writing-middleware.html">Writing middleware</a>
Expand All @@ -78,13 +74,10 @@
<li><a href="/{{ page.lang }}/guide/database-integration.html">Database integration</a>
</li>
</ul>
</li>
</ul>
</li>
<li>
<ul id="application-menu" class="menu">
<li><a href="/{{ page.lang }}/4x/api.html"{% if page.menu == 'api' %} class="active"{% endif %}>API reference</a>
<ul>
<li id="application-menu" class="submenu">
<a href="/{{ page.lang }}/4x/api.html"{% if page.menu == 'api' %} class="active"{% endif %}>API reference</a>
<ul class="submenu-content">
<li><a href="/{{ page.lang }}/5x/api.html">5.x</a>
</li>
<li><a href="/{{ page.lang }}/4x/api.html">4.x</a>
Expand All @@ -94,13 +87,10 @@
<li><a href="/2x/">2.x (deprecated)</a>
</li>
</ul>
</li>
</ul>
</li>
<li>
<ul id="advanced-topics-menu" class="menu">
<li><a href="/{{ page.lang }}/advanced/developing-template-engines.html"{% if page.menu == 'advanced' %} class="active"{% endif %}>Advanced topics</a>
<ul>
<li id="advanced-topics-menu" class="submenu">
<a href="/{{ page.lang }}/advanced/developing-template-engines.html"{% if page.menu == 'advanced' %} class="active"{% endif %}>Advanced topics</a>
<ul class="submenu-content">
<li><a href="/{{ page.lang }}/advanced/developing-template-engines.html">Building template engines</a>
</li>
<li><a href="/{{ page.lang }}/advanced/security-updates.html">Security updates</a>
Expand All @@ -112,13 +102,10 @@
<li><a href="/{{ page.lang }}/advanced/healthcheck-graceful-shutdown.html">Health checks & shutdown</a>
</li>
</ul>
</li>
</ul>
</li>
<li>
<ul id="resources-menu" class="menu">
<li><a href="/{{ page.lang }}/resources/glossary.html"{% if page.menu == 'resources' %} class="active"{% endif %}>Resources</a>
<ul>
<li id="resources-menu" class="submenu">
<a href="/{{ page.lang }}/resources/glossary.html"{% if page.menu == 'resources' %} class="active"{% endif %}>Resources</a>
<ul class="submenu-content">
<li>
<a href="/{{ page.lang }}/resources/community.html">Community</a>
</li>
Expand All @@ -138,14 +125,11 @@
<a href="/{{ page.lang }}/changelog/4x.html">Release Change Log</a>
</li>
</ul>
</li>
</ul>
</li>
<li><a href="/{{ page.lang }}/support" id="support-menu"{% if page.menu == 'support' %} class="active"{% endif %}>Support</a></li>
<li>
<ul id="blog-menu" class="menu">
<li><a href="{{site.posts.first.url}}"{% if page.menu == 'blog' %} class="active"{% endif %}>Blog</a>
<ul>
<li id="blog-menu" class="submenu">
<a href="{{site.posts.first.url}}"{% if page.menu == 'blog' %} class="active"{% endif %}>Blog</a>
<ul class="submenu-content">
<li>
<a href="{{site.posts.first.url}}">Latest post</a>
</li>
Expand All @@ -157,23 +141,10 @@
</li>
</ul>
</li>
</ul>
</li>
<!--
<li>
<ul id="changelog-menu" class="menu">
<li><a href="/{{ page.lang }}/changelog/4x.html"{% if page.menu == 'changelog' %} class="active"{% endif %}>Changelog</a>
<ul>
<li><a href="/{{ page.lang }}/changelog/4x.html">4.x</a></li>
</ul>
</li>
</ul>
</li>
-->
</ul>
<div id="theme-icon-container" class="theme-toggle default-theme" title="toggle darkmode">
<i class="fa fa-moon-o fa-2x hidden-dark"></i>
<span class="sun-icon hidden-light"></span>
</div>
</div>
</header>
</header>
46 changes: 15 additions & 31 deletions _includes/header/header-es.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@
<input id="q" placeholder="🔎 search">
<ul id="navmenu">
<li><a href="/{{ page.lang }}/" id="home-menu"{% if page.menu == 'home' %} class="active"{% endif %}>Inicio</a></li>
<li>
<ul id="getting-started-menu" class="menu">
<li><a href="/{{ page.lang }}/starter/installing.html"{% if page.menu == 'starter' %} class="active"{% endif %}>Cómo empezar</a>
<ul>
<li id="getting-started-menu" class="submenu">
<a href="/{{ page.lang }}/starter/installing.html"{% if page.menu == 'starter' %} class="active"{% endif %}>Cómo empezar</a>
<ul class="submenu-content">
<li>
<a href="/{{ page.lang }}/starter/installing.html">
Instalación
Expand Down Expand Up @@ -43,13 +42,10 @@
</a>
</li>
</ul>
</li>
</ul>
</li>
<li>
<ul id="guide-menu" class="menu">
<li><a href="/{{ page.lang }}/guide/routing.html"{% if page.menu == 'guide' %} class="active"{% endif %}>Guía</a>
<ul>
<li id="guide-menu" class="submenu">
<a href="/{{ page.lang }}/guide/routing.html"{% if page.menu == 'guide' %} class="active"{% endif %}>Guía</a>
<ul class="submenu-content">
<li><a href="/{{ page.lang }}/guide/routing.html">Direccionamiento</a>
</li>
<li><a href="/{{ page.lang }}/guide/writing-middleware.html">Escritura de middleware</a>
Expand All @@ -71,13 +67,10 @@
<li><a href="/{{ page.lang }}/guide/database-integration.html">Integración de la base de datos</a>
</li>
</ul>
</li>
</ul>
</li>
<li>
<ul id="application-menu" class="menu">
<li><a href="/{{ page.lang }}/4x/api.html"{% if page.menu == 'api' %} class="active"{% endif %}>Referencia de API</a>
<ul>
<li id="application-menu" class="submenu">
<a href="/{{ page.lang }}/4x/api.html"{% if page.menu == 'api' %} class="active"{% endif %}>Referencia de API</a>
<ul class="submenu-content">
<li><a href="/{{ page.lang }}/5x/api.html">5.x</a>
</li>
<li><a href="/{{ page.lang }}/4x/api.html">4.x</a>
Expand All @@ -87,13 +80,10 @@
<li><a href="/2x/">2.x (en desuso)</a>
</li>
</ul>
</li>
</ul>
</li>
<li>
<ul id="advanced-topics-menu" class="menu">
<li><a href="/{{ page.lang }}/advanced/developing-template-engines.html"{% if page.menu == 'advanced' %} class="active"{% endif %}>Temas avanzados</a>
<ul>
<li id="advanced-topics-menu" class="submenu">
<a href="/{{ page.lang }}/advanced/developing-template-engines.html"{% if page.menu == 'advanced' %} class="active"{% endif %}>Temas avanzados</a>
<ul class="submenu-content">
<li><a href="/{{ page.lang }}/advanced/developing-template-engines.html">Motores de plantilla</a>
</li>
<li><a href="/{{ page.lang }}/advanced/security-updates.html">Actualizaciones de seguridad</a>
Expand All @@ -102,24 +92,18 @@
</li>
<li><a href="/{{ page.lang }}/advanced/best-practice-performance.html">Mejores prácticas de rendimiento</a>
</li>

</ul>
</li>
</ul>
</li>
<li>
<ul id="resources-menu" class="menu">
<li><a href="/{{ page.lang }}/resources/glossary.html"{% if page.menu == 'resources' %} class="active"{% endif %}>Recursos</a>
<ul>
<li id="resources-menu" class="submenu">
<a href="/{{ page.lang }}/resources/glossary.html"{% if page.menu == 'resources' %} class="active"{% endif %}>Recursos</a>
<ul class="submenu-content">
<li><a href="/{{ page.lang }}/resources/glossary.html">Glosario</a>
</li>
<li><a href="/{{ page.lang }}/resources/middleware.html">Middleware</a>
</li>
<li><a href="/{{ page.lang }}/resources/community.html">Comunidad</a>
</li>
</ul>
</li>
</ul>
</li>
</ul>
<div id="theme-icon-container" class="theme-toggle default-theme" title="toggle darkmode">
Expand Down
Loading
Loading