From 07946c4e31fa91a09bd4b91d262e0bf84bb69235 Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jbobel@flexion.us>
Date: Fri, 7 Jul 2023 11:01:19 -0400
Subject: [PATCH] Removing blanket commented-out code and moving to the
 navigation conditional

---
 app/templates/admin_template.html                            | 5 +++--
 app/templates/components/uk_components/fieldset/template.njk | 2 +-
 app/templates/components/uk_components/header/template.njk   | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index 67f6f5412..f56108e5c 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -110,7 +110,8 @@
       ] %}
     {% endif %}
   {% else %}
-    {% set navigation = [
+  <!-- Add navigation back after pilot -->
+    {# {% set navigation = [
       {
         "href": url_for('main.get_started'),
         "text": "Using notify",
@@ -131,7 +132,7 @@
         "text": "Sign in",
         "active": header_navigation.is_selected('sign-in')
       }
-    ] %}
+    ] %} #}
   {% endif %}
 
   {{ govukHeader({
diff --git a/app/templates/components/uk_components/fieldset/template.njk b/app/templates/components/uk_components/fieldset/template.njk
index e41fce012..5388e06a8 100644
--- a/app/templates/components/uk_components/fieldset/template.njk
+++ b/app/templates/components/uk_components/fieldset/template.njk
@@ -1,4 +1,4 @@
-<fieldset class="govuk-fieldset margin-bottom-5
+<fieldset class="govuk-fieldset margin-y-5
   {%- if params.classes %} {{ params.classes }}{% endif %}"
   {%- if params.describedBy %} aria-describedby="{{ params.describedBy }}"{% endif %}
   {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
diff --git a/app/templates/components/uk_components/header/template.njk b/app/templates/components/uk_components/header/template.njk
index c8bb4fff8..6464705b1 100644
--- a/app/templates/components/uk_components/header/template.njk
+++ b/app/templates/components/uk_components/header/template.njk
@@ -71,7 +71,7 @@
     </div>
     <button type="button" class="usa-menu-btn">Menu</button>
   </div>
-  {# <nav aria-label="Primary navigation" class="usa-nav">
+  <nav aria-label="Primary navigation" class="usa-nav">
     <div class="usa-nav__inner">
       <button type="button" class="usa-nav__close">
         <img src="/static/images/usa-icons/close.svg" role="img" alt="Close" />
@@ -117,5 +117,5 @@
         </section> -->
       </div>
     </div>
-  </nav> #}
+  </nav>
 </header>