diff --git a/_layouts/default.html b/_layouts/default.html index 8bf647d5d4c338fb49237e43c6293eae3038c0fc..3e847037967458524ea8342150d68f2132df68a1 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -12,13 +12,13 @@ layout: table_wrappers <div class="side-bar"> <div class="site-header"> <a href="{{ site.url }}{{ site.baseurl }}" class="site-title lh-tight">{% include title.html %}</a> - <button id="site-nav-trigger" class="menu-button fs-3" data-text-toggle="Hide" type="button">Menu</button> + <button id="site-nav-trigger" class="site-button" data-text-toggle="Hide" type="button">Menu</button> </div> - <nav role="navigation" aria-label="Main navigation" id="site-nav" class="site-nav"> + <nav role="navigation" aria-label="Main" id="site-nav" class="site-nav"> {% include nav.html %} </nav> <footer class="site-footer"> - <p class="text-small text-grey-dk-000 mb-4">This site uses <a href="https://github.com/pmarsceill/just-the-docs">Just the Docs</a>, a documentation theme for Jekyll.</p> + This site uses <a href="https://github.com/pmarsceill/just-the-docs">Just the Docs</a>, a documentation theme for Jekyll. </footer> </div> <div id="main-wrap" class="main-wrap" tabindex="0"> @@ -34,17 +34,19 @@ layout: table_wrappers </div> {% endif %} {% if site.aux_links != nil %} - <ul class="list-style-none text-small aux-nav"> - {% for link in site.aux_links %} - <li class="d-inline-block my-0{% unless forloop.last %} mr-2{% endunless %}"><a href="{{ link.last }}">{{ link.first }}</a></li> - {% endfor %} - </ul> + <nav aria-label="Auxiliary" class="aux-nav"> + <ul class="aux-nav-list"> + {% for link in site.aux_links %} + <li class="aux-nav-list-item"><a href="{{ link.last }}">{{ link.first }}</a></li> + {% endfor %} + </ul> + </nav> {% endif %} </div> <div class="main-content-wrap"> {% unless page.url == "/" %} {% if page.parent %} - <nav class="breadcrumb-nav"> + <nav aria-label="Breadcrumb" class="breadcrumb-nav"> <ol class="breadcrumb-nav-list"> {% if page.grand_parent %} <li class="breadcrumb-nav-list-item"><a href="{{ first_level_url }}">{{ page.grand_parent }}</a></li> diff --git a/_sass/layout.scss b/_sass/layout.scss index 589f021e15cb2d71591e32bc4fbeb19fba12e8cd..d8c8164113706be34c491ef3cbcb5c50409d6cce 100644 --- a/_sass/layout.scss +++ b/_sass/layout.scss @@ -148,7 +148,7 @@ @include fs-6; } -.menu-button { +.site-button { appearance: none; display: flex; height: 100%; @@ -158,6 +158,7 @@ text-transform: uppercase; background: transparent; border: 0; + @include fs-3; @include mq(md) { display: none; @@ -185,6 +186,8 @@ body { left: 0; padding-top: $sp-4; padding-bottom: $sp-4; + color: $grey-dk-000; + @include fs-2; @include mq(md) { position: static; diff --git a/_sass/navigation.scss b/_sass/navigation.scss index 26863506e62ff26af845eb3b969db5e9dc728f2b..ec529f09ce5dae88c8bb806fb75bef6a9ec17039 100644 --- a/_sass/navigation.scss +++ b/_sass/navigation.scss @@ -81,9 +81,27 @@ .aux-nav { align-self: center; + + .aux-nav-list { + padding: 0; + margin: 0; + list-style: none; + @include fs-2; + } + + .aux-nav-list-item { + display: inline-block; + margin-right: $sp-2; + @include fs-2; + + &:last-child { + margin-right: 0; + } + } } // Breadcrumb nav + .breadcrumb-nav { @include mq(md) { margin-top: -$sp-4;