FAC Logo Update (#2256)

* FAC logo - new svg. Header - accordion darker text * Add filter to staticfiles directory * Add staticfiles section to development.md --------- Co-authored-by: Alex Steel <[email protected]>
GSA-TTS · Sep 27, 2023 · fb7cea1 · fb7cea1
1 parent fab8828
commit fb7cea1
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 15 deletions.
diff --git a/.github/workflows/pull-request-checks.yml b/.github/workflows/pull-request-checks.yml
@@ -21,6 +21,7 @@ jobs:
       dev-requirements: ${{ steps.filter.outputs.devrequirements }}
       docker: ${{ steps.filter.outputs.docker }}
       package: ${{ steps.filter.outputs.package }}
+      staticfiles: ${{ steps.filter.outputs.staticfiles }}
     steps:
       - uses: dorny/paths-filter@v2
         id: filter
@@ -34,17 +35,19 @@ jobs:
               - './backend/Dockerfile'
             package:
               - './backend/package.json'
+            staticfiles:
+              - './backend/static/**'
 
   # Tests and Linting invoked on a Pull Request
   testing-from-build:
     needs: [check-for-changes]
-    if: ${{ needs.check-for-changes.outputs.requirements == 'true' || needs.check-for-changes.outputs.dev-requirements == 'true' || needs.check-for-changes.outputs.docker == 'true' || needs.check-for-changes.outputs.package == 'true' }}
+    if: ${{ needs.check-for-changes.outputs.requirements == 'true' || needs.check-for-changes.outputs.dev-requirements == 'true' || needs.check-for-changes.outputs.docker == 'true' || needs.check-for-changes.outputs.package == 'true' || needs.check-for-changes.outputs.staticfiles == 'true' }}
     uses: ./.github/workflows/testing-from-build.yml
     secrets: inherit
 
   testing-from-ghcr:
     needs: [check-for-changes]
-    if: ${{ needs.check-for-changes.outputs.requirements != 'true' && needs.check-for-changes.outputs.dev-requirements != 'true' && needs.check-for-changes.outputs.docker != 'true' && needs.check-for-changes.outputs.package != 'true' }}
+    if: ${{ needs.check-for-changes.outputs.requirements != 'true' && needs.check-for-changes.outputs.dev-requirements != 'true' && needs.check-for-changes.outputs.docker != 'true' && needs.check-for-changes.outputs.package != 'true' && needs.check-for-changes.outputs.staticfiles != 'true'  }}
     uses: ./.github/workflows/testing-from-ghcr.yml
     secrets: inherit
 

diff --git a/backend/static/img/fac-full-logo.png b/backend/static/img/fac-full-logo.png
diff --git a/backend/static/img/fac-full-logo.svg b/backend/static/img/fac-full-logo.svg
diff --git a/backend/static/scss/_header.scss b/backend/static/scss/_header.scss
@@ -94,17 +94,8 @@
 .usa-header {
   background-color: #f3f9fe;
 
-  .usa-logo a {
-    color: color('primary-darker');
-    font-weight: 300;
-
-    & strong {
-      font-weight: bold;
-    }
-
-    &::before {
-      content: url('../img/fac-logo.svg');
-    }
+  .usa-accordion__button {
+    color: #171717
   }
 }
 

diff --git a/backend/templates/includes/nav_primary.html b/backend/templates/includes/nav_primary.html
@@ -5,7 +5,7 @@
         <div class="usa-logo" id="basic-logo">
             <em class="usa-logo__text">
                 <a href="/" title="FAC.gov">
-                    <strong>FAC</strong>.gov
+                    <img src="{% static 'img/fac-full-logo.svg' %}" role="img" width="109" height="26" alt="FAC.gov" />
                 </a>
             </em>
         </div>
@@ -22,7 +22,7 @@
                     <a href="https://example.gov" class="usa-nav__link">
                         <span>Search audit reports</span>
                     </a>
-                </li> 
+                </li>
             {% endcomment %}
             <li class="usa-nav__primary-item">
                 <button class="usa-accordion__button usa-nav__link"

diff --git a/docs/development.md b/docs/development.md
@@ -157,7 +157,14 @@ Although the migrations are run automatically, try running the migrations. This
 docker compose run web python manage.py migrate
 ```
 
+### Staticfiles
 
+Files that fall under the `/backend/static` directory need to be collected into the untracked directory `/backend/staticfiles`. This is done automatically when docker comes up, so you will 
+likely not need to do anything with these.
+
+However, if you edit any files in `/backend/static` you will need to either re-up docker or manually collect static. This is done via `python manage.py collectstatic`.
+
+Try to avoid pushing frequent edits to files in `/backend/static` (more than once every few days), as each change causes a rebuild of the ghcr image for use in the automatic PR tests.
 
 
 ### Load test data