From d684168a9083f8039f15cdcf81ec7dc1e866e10a Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Wed, 4 Dec 2024 11:46:21 -0500
Subject: [PATCH] Style, clean up, a11y updates

---
 .../sass/uswds/_uswds-theme-custom-styles.scss     | 14 ++++++++++++++
 app/templates/components/folder-path.html          |  2 +-
 app/templates/components/service_nav.html          |  4 ++--
 app/templates/views/templates/choose.html          |  3 ---
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
index 1a1ddc02b..38ae4059f 100644
--- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
+++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
@@ -231,6 +231,13 @@ td.table-empty-message {
    background-position: 0;
 }
 
+.folder-heading-template {
+   background: url(../img/material-icons/wysiwyg.svg) no-repeat;
+   padding-left: units(4);
+   display: inline-block;
+   background-position: 0;
+}
+
 .usa-checkbox .usa-checkbox__label {
    + a.template-list-folder {
       margin-left: units(4);
@@ -918,3 +925,10 @@ li.linked-card:hover svg,
    margin-left: calc(24px + 4px);
    margin-top: 4px;
 }
+
+// Send message flow
+
+#breadcrumb-template-folders, #nav-service-nav span {
+   font-size: units(3);
+   font-weight: bold;
+}
diff --git a/app/templates/components/folder-path.html b/app/templates/components/folder-path.html
index 05a577a89..976253ee3 100644
--- a/app/templates/components/folder-path.html
+++ b/app/templates/components/folder-path.html
@@ -6,7 +6,7 @@
   link_current_item=False,
   root_element='nav'
 ) %}
-  <{{ root_element }} id="breadcrumb-template-folders" class="navigation-service usa-breadcrumb padding-top-0">
+  <{{ root_element }} id="breadcrumb-template-folders" class="navigation-service usa-breadcrumb padding-top-0 padding-bottom-05" aria-label="Template folder path">
     {% for folder in folders %}
       {% if loop.last and not link_current_item %}
         {% if folder.template_type or not folder.id %}
diff --git a/app/templates/components/service_nav.html b/app/templates/components/service_nav.html
index 5670b3b48..68d30ce80 100644
--- a/app/templates/components/service_nav.html
+++ b/app/templates/components/service_nav.html
@@ -6,12 +6,12 @@
       <a href="{{ url_for('.organization_dashboard', org_id=current_service.organization_id) }}" class="usa-link navigation-organization-link">{{ current_service.organization_name }}</a>
     {% endif %}
   {% endif %}
-  <div class="font-body-lg text-bold">
+  <span>
     {{ current_service.name }}
     {% if not current_service.active %}
       <span class="navigation-service-name navigation-service-type--suspended">Suspended</span>
     {% endif %}
-  </div>
+  </span>
   <a href="{{ url_for('main.choose_account') }}" class="usa-link">Switch service</a>
 </div>
 </nav>
diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html
index 9c58c59cf..281374c37 100644
--- a/app/templates/views/templates/choose.html
+++ b/app/templates/views/templates/choose.html
@@ -37,9 +37,6 @@
         <p class="margin-top-0 margin-bottom-4">
           Every message starts with a template. To send, choose or create a template.
         </p>
-        {# you don't need folder_path unless you're trying to add the parent breadcrumb title to the first
-        page of the flow, if that's the case, you'll want to delete line 353 within the test_template_folders.py
-        file. assert len(page.select("nav#breadcrumb-template-folders a")) == len(expected_parent_link_args)#}
         {{ folder_path(
           folders=template_folder_path,
           service_id=current_service.id,