Skip to content

Commit

Permalink
Merge branch 'public'
Browse files Browse the repository at this point in the history
Merge changes to the nav bar that were made in another branch.
  • Loading branch information
cdesaintguilhem committed Jun 12, 2023
2 parents 6db4f36 + 8c3eef2 commit 08d1666
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 1 deletion.
35 changes: 35 additions & 0 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<header class="site-header" role="banner">

<div class="wrapper">
{%- assign default_paths = site.pages | map: "path" -%}
{%- assign page_paths = site.header_pages | default: default_paths -%}
<a class="site-title" rel="author" href="{{ "/" | relative_url }}">{{ site.title | escape }}</a>

{%- if page_paths -%}
<nav class="site-nav">
<input type="checkbox" id="nav-trigger" class="nav-trigger" />
<label for="nav-trigger">
<span class="menu-icon">
<svg viewBox="0 0 18 15" width="18px" height="15px">
<path d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.032C17.335,0,18,0.665,18,1.484L18,1.484z M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.032C17.335,6.031,18,6.696,18,7.516L18,7.516z M18,13.516C18,14.335,17.335,15,16.516,15H1.484 C0.665,15,0,14.335,0,13.516l0,0c0-0.82,0.665-1.483,1.484-1.483h15.032C17.335,12.031,18,12.695,18,13.516L18,13.516z"/>
</svg>
</span>
</label>

<div class="trigger">
<ul>
{%- for path in page_paths -%}
{%- assign my_page = site.pages | where: "path", path | first -%}
{%- if my_page.title -%}
<li><a class="page-link" href="{{ my_page.url | relative_url }}">
{{ my_page.title }}<br>
<span style="color: grey ">{{ my_page.subtitle }}</span>
</a></li>
{%- endif -%}
{%- endfor -%}
</ul>
</div>
</nav>
{%- endif -%}
</div>
</header>
26 changes: 25 additions & 1 deletion assets/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
}

.site-title {
margin-top: 10px;
font-size: 32px;
letter-spacing: 0px;
}
Expand All @@ -24,4 +25,27 @@

// .site-nav {
// line-height: 120px;
// }
// }

// Making the nav bar links look the way they do
nav ul {
list-style-type: none;
margin-left: 0;
margin-bottom: 0;
margin-top: 10px;
padding: 0;
}
nav ul li {
display: inline-block;
}
nav ul li a {
display: block;
padding: 5px 5px;
text-decoration: none;
font-size: medium;
color: #000;
}
nav ul li a span {
display: block;
font-size: small;
}
1 change: 1 addition & 0 deletions authors.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
layout: page
title: "Chefs"
subtitle: "Authors"
---

The kitchen of this FAEST is manned by, in alphabetical order:
Expand Down
1 change: 1 addition & 0 deletions components.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
layout: page
title: "Ingredients"
subtitle: "Components"
---

Ingredients for the FAEST:
Expand Down
1 change: 1 addition & 0 deletions resources.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
layout: page
title: "Recipes"
subtitle: "Documentation"
---

Specification:
Expand Down
1 change: 1 addition & 0 deletions software.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
layout: page
title: "Dishes"
subtitle: "Software"
---

The benchmark numbers below were collected on a consumer notebook with an AMD Ryzen 7 5800H processor, with a base clock speed of 3.2 GHz and 16 GB memory.
Expand Down

0 comments on commit 08d1666

Please sign in to comment.