commit f5d9a2cb5cd21c777320818406ee4117c136a3f5 parent 162a5cfb1b2126d58713b682a441e1037f3605ef Author: Hugo Soucy <hugo@soucy.cc> Date: Sat, 17 Oct 2020 22:56:58 -0400 Edit the main navigation markup Diffstat:
| M | templates/partials/navigation.html.twig | | | 95 | ++++++++++++++++++++++++++++++++++++++++++++++--------------------------------- |
1 file changed, 55 insertions(+), 40 deletions(-)
diff --git a/templates/partials/navigation.html.twig b/templates/partials/navigation.html.twig @@ -1,48 +1,63 @@ -{% macro loop(page) %} +<nav class="nav" id="n" data-js-nav=""> + {% macro loop(page) %} {% for p in page.children.visible %} - {% set current_page = (p.active or p.activeChild) ? 'selected' : '' %} - {% if p.children.visible.count > 0 %} - <li class="has-children {{ current_page }}"> - <a href="{{ p.url }}"> - {% if p.header.icon %}<i class="fa fa-{{ p.header.icon }}"></i>{% endif %} - {{ p.menu }} - </a> - <ul> - {{ _self.loop(p) }} - </ul> - </li> - {% else %} - <li class="{{ current_page }}"> - <a href="{{ p.url }}"> - {% if p.header.icon %}<i class="fa fa-{{ p.header.icon }}"></i>{% endif %} - {{ p.menu }} - </a> - </li> - {% endif %} + {% set current_page = (page.active or page.activeChild) ? ' is-current' : '' %} + + {% if p.children.visible.count > 0 %} + <li class="nav__item has-children{{ current_page }}"> + <a + {% if p.active %} + aria-current="page" + {% endif %} + class="nav__link" + href="{{ p.url }}"> + {{ p.menu }} + </a> + + <ul> + {{ _self.loop(p) }} + </ul> + </li> + {% else %} + <li class="nav__item{{ current_page }}"> + <a + {% if p.active %} + aria-current="page" + {% endif %} + class="nav__link" + href="{{ p.url }}"> + {{ p.menu }} + </a> + </li> + {% endif %} {% endfor %} -{% endmacro %} + {% endmacro %} -<ul> + <ul class="nav__list"> {% if theme_config.dropdown.enabled %} - {{ _self.loop(pages) }} + {{ _self.loop(pages) }} {% else %} - {% for page in pages.children.visible %} - {% set current_page = (page.active or page.activeChild) ? 'selected' : '' %} - <li class="{{ current_page }}"> - <a href="{{ page.url }}"> - {% if page.header.icon %}<i class="fa fa-{{ page.header.icon }}"></i>{% endif %} - {{ page.menu }} - </a> - </li> - {% endfor %} + {% for page in pages.children.visible %} + {% set current_page = (page.active or page.activeChild) ? ' is-current' : '' %} + <li class="nav__item{{ current_page }}"> + <a + {% if page.active %} + aria-current="page" + {% endif %} + class="nav__link" + href="{{ page.url }}"> + {{ page.menu }} + </a> + </li> + {% endfor %} {% endif %} + {% for mitem in site.menu %} - <li> - <a href="{{ mitem.url }}"> - {% if mitem.icon %}<i class="fa fa-{{ mitem.icon }}"></i>{% endif %} - {{ mitem.text }} - </a> - </li> + <li class="nav__item"> + <a class="nav__link" href="{{ mitem.url }}"> + {{ mitem.text }} + </a> + </li> {% endfor %} -</ul> - + </ul> +</nav>