Skip to content

Commit

Permalink
Fix navigation to be closer to design specs
Browse files Browse the repository at this point in the history
  • Loading branch information
louismaximepiton committed Mar 28, 2024
1 parent 80f92c1 commit e86fe5a
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 15 deletions.
9 changes: 0 additions & 9 deletions docs/_data/data_menus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,3 @@ toc2:

- title: Modules
subfolderitems:

- title: About
subfolderitems:
- page: "License"
url: about/License_docs
- page: "Team"
url: about/Team_docs
- page: "Cookies"
url: about/Cookies_docs
9 changes: 5 additions & 4 deletions docs/_includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<footer class="footer navba position-sticky top-100" data-bs-theme="dark">
<footer class="footer navbar position-sticky top-100" data-bs-theme="dark">
<h2 class="visually-hidden">Sitemap & information</h2>
<div class="container-xxl footer-terms">
<ul class="navbar-nav gap-md-3">
<li class="fw-bold">© Orange 2024</li>
<li><a class="nav-link" href="/ods-flutter/about/License_docs">License</a></li>
<li><a class="nav-link" href="/ods-flutter/about/Team_docs">Team</a></li>
<li><a class="nav-link" href="/ods-flutter/about/Cookies_docs">Cookies</a></li>
<li><a class="nav-link" href="https://oran.ge/dsflutter" target="_blank" rel="noopener">Orange Design System</a></li>
<li><a class="nav-link" href="https://boosted.orange.com" target="_blank" rel="noopener">Boosted</a></li>
<li><a class="nav-link" href="https://orange-opensource.github.io/ods-android/" target="_blank" rel="noopener">ODS Android</a></li>
<li><a class="nav-link" href="https://orange-opensource.github.io/ods-ios/" target="_blank" rel="noopener">ODS iOS</a></li>
<li><a class="nav-link" href="https://boosted.orange.com" target="_blank" rel="noopener">ODS Web Boosted</a></li>
<li><a class="nav-link" href="https://oran.ge/icons" target="_blank" rel="noopener">Solaris Icons</a></li>
</ul>
</div>
Expand Down
15 changes: 15 additions & 0 deletions docs/_includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@
<a id="top"></a>

<header class="sticky-top" data-bs-theme="dark">
<nav class="navbar navbar-expand-lg supra" data-bs-theme="dark" aria-label="Supra navigation of ODS Flutter">
<div class="container-xxl">
<ul class="navbar-nav">
<li class="nav-item"><a href="#" class="nav-link">ODS Android</a></li>
<li class="nav-item"><a href="#" class="nav-link">ODS iOS</a></li>
<li class="nav-item"><a href="#" class="nav-link active" aria-current="page">ODS Flutter</a></li>
</ul>
</div>
</nav>
<div class="navbar navbar-expand-lg" aria-label="Global header of ODS Flutter">
<div class="container-xxl">
<div class="navbar-brand me-auto me-lg-4">
Expand All @@ -29,6 +38,12 @@ <h1 class="two-lined text-white">
</h1>
</div>
<ul class="navbar-nav flex-row ms-auto">
<li class="nav-item">
<a class="nav-link nav-icon" href="https://github.com/Orange-OpenSource/ods-flutter/" target="_blank" rel="noopener">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 499.36" role="img"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg>
<span class="visually-hidden">GitHub repository</span>
</a>
</li>
<li class="nav-item dropdown">
<button class="nav-link nav-icon dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="Toggle mode (auto)">
<svg class="theme-icon-active"><use href="#ui-auto-mode"></use></svg>
Expand Down
11 changes: 9 additions & 2 deletions docs/_layouts/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,18 @@
<div class="row">

<div class="col-lg-3" aria-label="Global navigation of ODS iOS">
<aside class="h-100 border-end border-1 border-light overflow-auto z-offcanvas" style="position: sticky; top: 120px; max-height: calc(100vh - 180px);">
<aside class="h-100 border-end border-1 border-light overflow-auto z-offcanvas" style="position: sticky; top: 160px; max-height: calc(100vh - 220px);">

<div class="offcanvas-lg offcanvas-end" tabindex="-1" id="offcanvasWrapper" aria-labelledby="offcanvasWrapperLabel" style="--bs-offcanvas-width: 300px;">
<nav class="d-lg-none navbar navbar-expand supra ps-3" data-bs-theme="dark" aria-label="Supra navigation of ODS Flutter">
<ul class="navbar-nav">
<li class="nav-item"><a href="#" class="nav-link">ODS Android</a></li>
<li class="nav-item"><a href="#" class="nav-link">ODS iOS</a></li>
<li class="nav-item"><a href="#" class="nav-link active" aria-current="page">ODS Flutter</a></li>
</ul>
</nav>
<div class="offcanvas-header border-bottom border-1 border-light">
<h5 class="offcanvas-title" id="offcanvasWrapperLabel">ODS iOS navigation</h5>
<h5 class="offcanvas-title" id="offcanvasWrapperLabel">ODS Flutter navigation</h5>
<button type="button" class="btn-close" data-bs-dismiss="offcanvas" data-bs-target="#offcanvasWrapper" style="margin-right: -.625rem;"><span class="visually-hidden">Close</span></button>
</div>
<nav class="offcanvas-body d-flex flex-column pb-4 pb-lg-0 pe-1 gap-4">
Expand Down

0 comments on commit e86fe5a

Please sign in to comment.