diff --git a/_includes/highlights.html b/_includes/highlights.html index 00d62581..b632073b 100644 --- a/_includes/highlights.html +++ b/_includes/highlights.html @@ -3,8 +3,6 @@ {% endcomment %} -{% include tagline.html %} - @@ -40,4 +38,4 @@ Could also have 2 or 6. - + \ No newline at end of file diff --git a/_includes/menu.html b/_includes/menu.html index 7986a5ad..db57bd52 100644 --- a/_includes/menu.html +++ b/_includes/menu.html @@ -4,48 +4,48 @@ {% endcomment %} - - - {{site.title}} - - Menu - - - - - - {% for nav_item in include.primary_navigation %} - {% unless nav_item.children %} - {% assign basedir = page.url | remove_first: '/' | split: '/' | first | lstrip %} - {% assign linkdir = nav_item.url | replace: "/", "" | lstrip %} - - {{ nav_item.name | escape }} - - {% else %} - {% assign nav_id = 'primary-nav-' | append: forloop.index %} - - {{ nav_item.name | escape }} - - {% for subnav_item in nav_item.children %} - - {{ subnav_item.name | escape }} - - {% endfor %} - - - {% endunless %} + + + {{site.title}} + + Menu + + + + + + {% for nav_item in include.primary_navigation %} + {% unless nav_item.children %} + {% assign basedir = page.url | remove_first: '/' | split: '/' | first | lstrip %} + {% assign linkdir = nav_item.url | replace: "/", "" | lstrip %} + + {{ nav_item.name | escape }} + + {% else %} + {% assign nav_id = 'primary-nav-' | append: forloop.index %} + + {{ nav_item.name | escape }} + + {% for subnav_item in nav_item.children %} + + {{ subnav_item.name | escape }} + {% endfor %} - - - {% for nav_item in include.secondary_navigation %} - - {{ nav_item.name | escape }} - - {% endfor %} - - {% include searchgov/form.html affiliate=site.searchgov.affiliate %} - + + {% endunless %} + {% endfor %} + + + + {% for nav_item in include.secondary_navigation %} + + {{ nav_item.name | escape }} + + {% endfor %} + + {% include searchgov/form.html affiliate=site.searchgov.affiliate %} - + + \ No newline at end of file diff --git a/_includes/sidenav.html b/_includes/sidenav.html index 7b8f357e..a11208e6 100644 --- a/_includes/sidenav.html +++ b/_includes/sidenav.html @@ -7,34 +7,45 @@ - Parent link - - Current page - - Child link - - Child link - - Grandchild link - - Grandchild link - - Grandchild link - - Grandchild link - - - - Child link - - Child link - - Child link - - - - Parent link - + Parent link + + + Current page + + + Child link + + + Child link + + + Grandchild link + + + Grandchild link + + + Grandchild link + + + Grandchild link + + + + + Child link + + + Child link + + + Child link + + + + + Parent link + - + \ No newline at end of file diff --git a/_layouts/default.html b/_layouts/default.html index ad2a48cf..09881ba0 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,5 +1,6 @@ {% comment %} -This is used for just about every page, except the home page +This is used for just about every page. It provides the border around the content. +The home page uses wide.html layout, since it extends full width of page {% endcomment %} diff --git a/_layouts/page.html b/_layouts/page.html index 3703de7e..62e010ff 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -2,8 +2,12 @@ layout: default --- - +{% comment %} +This template is for a single page that does not have a date associated with it. For example, an about page. +{% endcomment %} + + {% if page.sidenav == true %} {% include sidenav.html %} {% endif %} @@ -11,4 +15,4 @@ {{ content }} - + \ No newline at end of file diff --git a/_layouts/post.html b/_layouts/post.html index d90b1b2e..1a1848f9 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -2,6 +2,11 @@ layout: default --- +{% comment %} +This is used in blog posts. The index page can be found at blog/index.html +{% endcomment %} + + {{page.title}}