From ce680dda6abcba961c6a9fcffc652c383647fe69 Mon Sep 17 00:00:00 2001
From: Eddie A Tejeda <eddie.tejeda@gmail.com>
Date: Sat, 1 Jun 2019 21:00:35 -0600
Subject: [PATCH] clean up formatting of html

---
 _includes/highlights.html |  4 +-
 _includes/menu.html       | 82 +++++++++++++++++++--------------------
 _includes/sidenav.html    | 69 ++++++++++++++++++--------------
 _layouts/default.html     |  3 +-
 _layouts/page.html        |  8 +++-
 _layouts/post.html        |  5 +++
 6 files changed, 95 insertions(+), 76 deletions(-)

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 %}
-
 <section class="usa-graphic-list usa-section usa-section--dark">
   <div class="grid-container">
     <div class="usa-graphic-list__row grid-row grid-gap">
@@ -40,4 +38,4 @@ <h3 class="usa-graphic-list__heading">Could also have 2 or 6.</h3>
       </div>
     </div>
   </div>
-</section>
+</section>
\ 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 %}
 
 <header class="usa-header usa-header--extended" role="banner">
-   <div class="usa-navbar">
-      <div class="usa-logo" id="extended-logo">
-         <em class="usa-logo__text"><a href="{{site.baseurl}}" title="Home" aria-label="Home">{{site.title}}</a></em>
-      </div>
-      <button class="usa-menu-btn">Menu</button>
-   </div>
-   <nav role="navigation" class="usa-nav">
-      <div class="usa-nav__inner">
-        <button class="usa-nav__close"><img src="{{ site.baseurl }}/assets/uswds/img/close.svg" alt="close"></button>
-          <ul class="usa-nav__primary usa-accordion">
-            {% 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 %}
-                <li class="usa-nav__primary-item">
-                  <a class="usa-nav__link{% if basedir == linkdir %} usa-current{% endif %}" href="{{ nav_item.url | prepend: site.baseurl}}"><span>{{ nav_item.name | escape }}</span></a>
-              </li>
-              {% else %}
-                {% assign nav_id = 'primary-nav-' | append: forloop.index %}
-                <li class="usa-nav__primary-item">
-                  <button class="usa-accordion__button usa-nav__link" aria-expanded="false" aria-controls="{{ nav_id }}"><span>{{ nav_item.name | escape }}</span></button>
-                  <ul id="{{ nav_id }}" class="usa-nav__submenu">
-                    {% for subnav_item in nav_item.children %}
-                    <li class="usa-nav__submenu-item">
-                      <a href="{{ subnav_item.url | prepend: site.baseurl }}">{{ subnav_item.name | escape }}</a>
-                    </li>
-                    {% endfor %}
-                  </ul>
-                </li>
-              {% endunless %}
+  <div class="usa-navbar">
+    <div class="usa-logo" id="extended-logo">
+      <em class="usa-logo__text"><a href="{{site.baseurl}}" title="Home" aria-label="Home">{{site.title}}</a></em>
+    </div>
+    <button class="usa-menu-btn">Menu</button>
+  </div>
+  <nav role="navigation" class="usa-nav">
+    <div class="usa-nav__inner">
+      <button class="usa-nav__close"><img src="{{ site.baseurl }}/assets/uswds/img/close.svg" alt="close"></button>
+      <ul class="usa-nav__primary usa-accordion">
+        {% 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 %}
+        <li class="usa-nav__primary-item">
+          <a class="usa-nav__link{% if basedir == linkdir %} usa-current{% endif %}" href="{{ nav_item.url | prepend: site.baseurl}}"><span>{{ nav_item.name | escape }}</span></a>
+        </li>
+        {% else %}
+        {% assign nav_id = 'primary-nav-' | append: forloop.index %}
+        <li class="usa-nav__primary-item">
+          <button class="usa-accordion__button usa-nav__link" aria-expanded="false" aria-controls="{{ nav_id }}"><span>{{ nav_item.name | escape }}</span></button>
+          <ul id="{{ nav_id }}" class="usa-nav__submenu">
+            {% for subnav_item in nav_item.children %}
+            <li class="usa-nav__submenu-item">
+              <a href="{{ subnav_item.url | prepend: site.baseurl }}">{{ subnav_item.name | escape }}</a>
+            </li>
             {% endfor %}
           </ul>
-         <div class="usa-nav__secondary">
-            <ul class="usa-nav__secondary-links">
-              {% for nav_item in include.secondary_navigation %}
-                <li class="usa-nav__secondary-item">
-                  <a href="{{ nav_item.url | prepend: site.baseurl }}">{{ nav_item.name | escape }}</a>
-                </li>
-              {% endfor %}
-            </ul>
-            {% include searchgov/form.html affiliate=site.searchgov.affiliate %}
-         </div>
+        </li>
+        {% endunless %}
+        {% endfor %}
+      </ul>
+      <div class="usa-nav__secondary">
+        <ul class="usa-nav__secondary-links">
+          {% for nav_item in include.secondary_navigation %}
+          <li class="usa-nav__secondary-item">
+            <a href="{{ nav_item.url | prepend: site.baseurl }}">{{ nav_item.name | escape }}</a>
+          </li>
+          {% endfor %}
+        </ul>
+        {% include searchgov/form.html affiliate=site.searchgov.affiliate %}
       </div>
-   </nav>
+    </div>
+  </nav>
 </header>
\ 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 @@
   <nav>
     <ul class="usa-sidenav">
       <li class="usa-sidenav__item">
-      <a href="">Parent link</a>
-    </li><li class="usa-sidenav__item">
-      <a href="" class="usa-current">Current page</a><ul class="usa-sidenav__sublist">
-        <li class="usa-sidenav__item">
-      <a href="">Child link</a>
-    </li><li class="usa-sidenav__item">
-      <a href="" class="usa-current">Child link</a><ul class="usa-sidenav__sublist">
-        <li class="usa-sidenav__item">
-      <a href="">Grandchild link</a>
-    </li><li class="usa-sidenav__item">
-      <a href="">Grandchild link</a>
-    </li><li class="usa-sidenav__item">
-      <a href="" class="usa-current">Grandchild link</a>
-    </li><li class="usa-sidenav__item">
-      <a href="">Grandchild link</a>
-    </li>
-      </ul>
-    </li><li class="usa-sidenav__item">
-      <a href="">Child link</a>
-    </li><li class="usa-sidenav__item">
-      <a href="">Child link</a>
-    </li><li class="usa-sidenav__item">
-      <a href="">Child link</a>
-    </li>
-      </ul>
-    </li><li class="usa-sidenav__item">
-      <a href="">Parent link</a>
-    </li>
+        <a href="">Parent link</a>
+      </li>
+      <li class="usa-sidenav__item">
+        <a href="" class="usa-current">Current page</a>
+        <ul class="usa-sidenav__sublist">
+          <li class="usa-sidenav__item">
+            <a href="">Child link</a>
+          </li>
+          <li class="usa-sidenav__item">
+            <a href="" class="usa-current">Child link</a>
+            <ul class="usa-sidenav__sublist">
+              <li class="usa-sidenav__item">
+                <a href="">Grandchild link</a>
+              </li>
+              <li class="usa-sidenav__item">
+                <a href="">Grandchild link</a>
+              </li>
+              <li class="usa-sidenav__item">
+                <a href="" class="usa-current">Grandchild link</a>
+              </li>
+              <li class="usa-sidenav__item">
+                <a href="">Grandchild link</a>
+              </li>
+            </ul>
+          </li>
+          <li class="usa-sidenav__item">
+            <a href="">Child link</a>
+          </li>
+          <li class="usa-sidenav__item">
+            <a href="">Child link</a>
+          </li>
+          <li class="usa-sidenav__item">
+            <a href="">Child link</a>
+          </li>
+        </ul>
+      </li>
+      <li class="usa-sidenav__item">
+        <a href="">Parent link</a>
+      </li>
     </ul>
   </nav>
-</aside>
+</aside>
\ 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
 ---
 
-<div class="grid-row grid-gap">
+{% comment %} 
+This template is for a single page that does not have a date associated with it. For example, an about page.
+{% endcomment %}
+
 
+<div class="grid-row grid-gap">
   {% if page.sidenav == true %}
     {% include sidenav.html %}
   {% endif %}
@@ -11,4 +15,4 @@
   <div class="usa-layout-docs__main desktop:grid-col-9 usa-prose">
     {{ content }}
   </div>
-</div>
+</div>
\ 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 %}
+
+
 <div class="grid-row grid-gap">
   <div class="usa-layout-docs__main desktop:grid-col-9 usa-prose">
     <h1 class="title">{{page.title}}</h1>