Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
61 changes: 26 additions & 35 deletions _includes/layouts/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,50 +4,41 @@
{% endcomment %}
<!DOCTYPE html>
<html lang="en">
{% assign was_redirected = false %}
{% if env.production %}
{% assign is_index = page.url == "/" %}
{% if redirect_bases[tags[0]] or is_index %}
{% assign was_redirected = true %}
{% include "meta_redirect.html", is_index: is_index %}
{% endif %}
{% include "meta.html" %}

<body class="display-flex flex-column minh-viewport">
{% include "header.html" %}
{% if tags %}
{% assign primary_navigation = navigation[tags] %}
{% else %}
{% assign primary_navigation = site.primary_navigation %}
{% endif %}

{% unless was_redirected %}
{% include "meta.html" %}
<body class="display-flex flex-column minh-viewport">
{% include "header.html" %}
{% if tags %}
{% assign primary_navigation = navigation[tags] %}
{% else %}
{% assign primary_navigation = site.primary_navigation %}
{% endif %}
{% include "menu.html" %}

{% include "menu.html" %}
{{ content }}

{{ content }}
{% include "touchpoints-button.html" %}

{% include "touchpoints-button.html" %}

{% include "footer.html" %}
{% include "footer.html" %}

{% comment %} Hide SVG Sprites {% endcomment %}
<div style="display: none;">
{% usa_icons_sprite %}
{% comment %} Hide SVG Sprites {% endcomment %}
<div style="display: none;">
{% usa_icons_sprite %}

{% comment %}
{% comment %}

TODO: Remove once this set of icons once we've determined the usa_icons
above is enough. Currently, keeping both adds two sets of SVGs with duplicate IDs,
which is flagged as by pa11y as an accessibility error.
TODO: Remove once this set of icons once we've determined the usa_icons
above is enough. Currently, keeping both adds two sets of SVGs with duplicate IDs,
which is flagged as by pa11y as an accessibility error.

{% uswds_icons_sprite %}
{% uswds_icons_sprite %}

{% endcomment %}
{% endcomment %}

</div>
</div>

{% include "scripts.html" %}
</body>
{% endunless %}
</html>
{% include "scripts.html" %}
</body>

</html>
14 changes: 0 additions & 14 deletions _includes/meta_redirect.html

This file was deleted.

Loading