From a6d3741dde5a11cf7a391eef761e9a75b7a1b862 Mon Sep 17 00:00:00 2001
From: James Mejia <james.mejia@bixal.com>
Date: Wed, 30 Oct 2019 11:39:42 -0500
Subject: [PATCH 1/6] Remove extra class on slim footer.

---
 src/components/10-footer/footer--slim.njk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/10-footer/footer--slim.njk b/src/components/10-footer/footer--slim.njk
index 638fa4a362..7d8fd8a976 100755
--- a/src/components/10-footer/footer--slim.njk
+++ b/src/components/10-footer/footer--slim.njk
@@ -24,7 +24,7 @@
       </div>
       <div class="mobile-lg:grid-col-4">
         <address class="usa-footer__address">
-          <div class="grid-row grid-gap mobile-lg:grid-gap-0">
+          <div class="grid-row grid-gap">
             <div class="grid-col-auto mobile-lg:grid-col-12 desktop:grid-col-auto">
               <div class="usa-footer__contact-info">
                 <a href="tel:1-800-555-5555">(800) CALL-GOVT</a>

From a03efdfd789ca77c359f25e0f548e2b79a107498 Mon Sep 17 00:00:00 2001
From: James Mejia <james.mejia@bixal.com>
Date: Thu, 31 Oct 2019 09:27:29 -0500
Subject: [PATCH 2/6] Move inline-block on contact-info to slim footer only.

---
 src/stylesheets/components/_footer.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/stylesheets/components/_footer.scss b/src/stylesheets/components/_footer.scss
index 538f3b8e5f..b899e5583e 100644
--- a/src/stylesheets/components/_footer.scss
+++ b/src/stylesheets/components/_footer.scss
@@ -91,7 +91,6 @@
 }
 
 .usa-footer__contact-info {
-  display: inline-block;
   line-height: line-height($theme-footer-font-family, 2);
 
   a {
@@ -250,6 +249,8 @@
   }
 
   .usa-footer__contact-info {
+    display: inline-block;
+
     @include at-media('mobile-lg') {
       @include u-padding-y(2);
       margin-top: 0;

From e0d1fe5182c12f24c8e0e9b35bb05244f152079f Mon Sep 17 00:00:00 2001
From: James Mejia <james.mejia@bixal.com>
Date: Thu, 31 Oct 2019 11:55:14 -0500
Subject: [PATCH 3/6] Set grid-col-auto on desktop to Primary Footer section.

---
 src/components/10-footer/footer.njk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/10-footer/footer.njk b/src/components/10-footer/footer.njk
index 98b0a096f8..9b271765da 100755
--- a/src/components/10-footer/footer.njk
+++ b/src/components/10-footer/footer.njk
@@ -5,19 +5,19 @@
   <div class="usa-footer__primary-section">
     <nav class="usa-footer__nav">
       <ul class="grid-row grid-gap">
-        <li class="mobile-lg:grid-col-4 desktop:grid-col-2 usa-footer__primary-content">
+        <li class="mobile-lg:grid-col-4 desktop:grid-col-auto usa-footer__primary-content">
           <a class="usa-footer__primary-link" href="javascript:void(0);">Primary link</a>
         </li>
-        <li class="mobile-lg:grid-col-4 desktop:grid-col-2 usa-footer__primary-content">
+        <li class="mobile-lg:grid-col-4 desktop:grid-col-auto usa-footer__primary-content">
           <a class="usa-footer__primary-link" href="javascript:void(0);">Primary link</a>
         </li>
-        <li class="mobile-lg:grid-col-4 desktop:grid-col-2 usa-footer__primary-content">
+        <li class="mobile-lg:grid-col-4 desktop:grid-col-auto usa-footer__primary-content">
           <a class="usa-footer__primary-link" href="javascript:void(0);">Primary link</a>
         </li>
-        <li class="mobile-lg:grid-col-4 desktop:grid-col-2 usa-footer__primary-content">
+        <li class="mobile-lg:grid-col-4 desktop:grid-col-auto usa-footer__primary-content">
           <a class="usa-footer__primary-link" href="javascript:void(0);">Primary link</a>
         </li>
-        <li class="mobile-lg:grid-col-4 desktop:grid-col-2 usa-footer__primary-content">
+        <li class="mobile-lg:grid-col-4 desktop:grid-col-auto usa-footer__primary-content">
           <a class="usa-footer__primary-link" href="javascript:void(0);">Primary link</a>
         </li>
       </ul>

From 6c1c821a5ae8b635729f70cc6bffb8d59c9b66e2 Mon Sep 17 00:00:00 2001
From: James Mejia <james.mejia@bixal.com>
Date: Thu, 31 Oct 2019 12:42:14 -0500
Subject: [PATCH 4/6] Update Big Footer.

Use pseudoelement for collapsible footer for consistent arrow size.
---
 src/stylesheets/components/_footer.scss | 40 ++++++++++++++++++-------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/stylesheets/components/_footer.scss b/src/stylesheets/components/_footer.scss
index b899e5583e..130ee4dadd 100644
--- a/src/stylesheets/components/_footer.scss
+++ b/src/stylesheets/components/_footer.scss
@@ -276,18 +276,12 @@
 
   .usa-footer__primary-link {
     @include h4;
-    @include add-background-svg('arrow-down');
-    background-position: units(2) center;
-    background-size: units(1.5);
     line-height: line-height('heading', 2);
     margin: 0;
-    padding-left: units(4);
 
     @include at-media('mobile-lg') {
       @include u-padding-y(0);
-      background: none;
       margin-bottom: units(1);
-      padding-left: 0;
 
       &:hover {
         cursor: auto;
@@ -297,19 +291,45 @@
   }
 
   .usa-footer__primary-content--collapsible {
+    .usa-footer__primary-link {
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+      justify-content: flex-start;
+
+      // Arrow for collapsible content.
+      &::before {
+        @include add-background-svg('arrow-down');
+        content: '';
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        height: units(1.5);
+        width: units(1.5);
+        margin-right: units(1);
+        background-size: contain;
+      }
+
+      @include at-media('mobile-lg') {
+        &::before {
+          content: none;
+        }
+      }
+    }
+
     &.hidden {
       .usa-list--unstyled {
         display: none;
       }
 
       .usa-footer__primary-link {
-        @include add-background-svg('arrow-right');
-        cursor: pointer;
+
+        &::before {
+          @include add-background-svg('arrow-right');
+        }
 
         @include at-media('mobile-lg') {
-          background: none;
           margin: 0;
-          padding-left: 0;
         }
       }
     }

From ac62269f6869182963ca33eeadd2b999c53116b3 Mon Sep 17 00:00:00 2001
From: Dano Williams <daniel.williams@gsa.gov>
Date: Mon, 18 Nov 2019 15:01:51 -0800
Subject: [PATCH 5/6] Alphabetize and Prettier

---
 src/stylesheets/components/_footer.scss | 107 ++++++++++++------------
 1 file changed, 53 insertions(+), 54 deletions(-)

diff --git a/src/stylesheets/components/_footer.scss b/src/stylesheets/components/_footer.scss
index 130ee4dadd..d302c13542 100644
--- a/src/stylesheets/components/_footer.scss
+++ b/src/stylesheets/components/_footer.scss
@@ -16,12 +16,12 @@
 }
 
 .usa-footer__nav {
-  @include u-margin-x('auto');
+  @include u-margin-x("auto");
   @include u-padding-x(0);
-  border-bottom: 1px solid color('base-light');
-  max-width: units('desktop');
+  border-bottom: 1px solid color("base-light");
+  max-width: units("desktop");
 
-  @include at-media('mobile-lg') {
+  @include at-media("mobile-lg") {
     @include add-responsive-site-margins;
     border-bottom: none;
   }
@@ -32,14 +32,14 @@
 }
 
 .usa-footer__primary-section {
-  background-color: color('base-lightest');
+  background-color: color("base-lightest");
 }
 
 .usa-footer__primary-container {
-  @include u-margin-x('auto');
-  max-width: units('desktop');
+  @include u-margin-x("auto");
+  max-width: units("desktop");
 
-  @include at-media('desktop') {
+  @include at-media("desktop") {
     @include u-padding-x(4);
   }
 }
@@ -59,10 +59,10 @@
 .usa-footer__primary-link {
   @include u-padding-x($theme-site-margins-mobile-width);
   @include u-padding-y(2);
-  @include u-text('ink', 'no-underline', 'bold');
+  @include u-text("ink", "no-underline", "bold");
   display: block;
 
-  @include at-media('mobile-lg') {
+  @include at-media("mobile-lg") {
     @include u-padding-x(0);
   }
 
@@ -85,7 +85,7 @@
     padding-top: units(2);
   }
 
-  @include at-media('mobile-lg') {
+  @include at-media("mobile-lg") {
     margin-left: 0;
   }
 }
@@ -94,23 +94,23 @@
   line-height: line-height($theme-footer-font-family, 2);
 
   a {
-    @include u-text('ink', 'no-underline');
+    @include u-text("ink", "no-underline");
   }
 
   &:hover {
     text-decoration: underline;
   }
 
-  @include at-media('mobile-lg') {
-    @include u-flex('justify-end');
+  @include at-media("mobile-lg") {
+    @include u-flex("justify-end");
     margin-top: units(1);
   }
 }
 
 .usa-footer__primary-content {
-  border-top: 1px solid color('base-light');
+  border-top: 1px solid color("base-light");
 
-  @include at-media('mobile-lg') {
+  @include at-media("mobile-lg") {
     border: none;
   }
 }
@@ -132,18 +132,18 @@
 
 .usa-footer__secondary-section {
   @include u-padding-y(2.5);
-  background-color: color('base-lighter');
+  background-color: color("base-lighter");
 
   a {
-    color: color('ink');
+    color: color("ink");
   }
 }
 
 .usa-footer__logo {
   @include u-margin-y(1);
-  @include at-media('mobile-lg') {
+  @include at-media("mobile-lg") {
     @include u-margin-y(0);
-    @include u-flex('align-center');
+    @include u-flex("align-center");
   }
 }
 
@@ -154,13 +154,13 @@
 .usa-footer__logo-heading {
   @include h3;
   @include u-margin-y(1);
-  line-height: line-height('heading', 1);
+  line-height: line-height("heading", 1);
 }
 
 .usa-footer__contact-links {
   margin-top: units(3);
 
-  @include at-media('mobile-lg') {
+  @include at-media("mobile-lg") {
     margin-top: 0;
     text-align: right;
   }
@@ -170,7 +170,7 @@
   @include h3;
   margin-top: 0;
 
-  @include at-media('mobile-lg') {
+  @include at-media("mobile-lg") {
     @include u-margin-y(0.5);
   }
 }
@@ -183,8 +183,8 @@
     text-decoration: none;
   }
 
-  @include at-media('mobile-lg') {
-    @include u-flex('justify-end');
+  @include at-media("mobile-lg") {
+    @include u-flex("justify-end");
   }
 }
 
@@ -193,7 +193,7 @@
   @include u-square($size-touch-target);
   background-position: center center;
   background-size: auto $background-height;
-  background-color: color('black-transparent-10');
+  background-color: color("black-transparent-10");
   display: inline-block;
 
   span {
@@ -202,24 +202,24 @@
 }
 
 .usa-social-link--facebook {
-  @include add-background-svg('social-icons/facebook25');
+  @include add-background-svg("social-icons/facebook25");
 }
 
 .usa-social-link--twitter {
-  @include add-background-svg('social-icons/twitter16');
+  @include add-background-svg("social-icons/twitter16");
 }
 
 .usa-social-link--youtube {
-  @include add-background-svg('social-icons/youtube15');
+  @include add-background-svg("social-icons/youtube15");
 }
 
 .usa-social-link--rss {
-  @include add-background-svg('social-icons/rss25');
+  @include add-background-svg("social-icons/rss25");
 }
 
 .usa-footer__address {
-  @include at-media('mobile-lg') {
-    @include u-flex('justify-end');
+  @include at-media("mobile-lg") {
+    @include u-flex("justify-end");
   }
 }
 
@@ -227,21 +227,21 @@
 
 .usa-footer--slim {
   .usa-footer__nav {
-    @include at-media('desktop') {
+    @include at-media("desktop") {
       @include u-padding-x(0);
     }
   }
 
   .usa-footer__address {
-    @include u-padding-y(2);
     @include u-padding-x($theme-site-margins-mobile-width);
-    @include at-media('mobile-lg') {
+    @include u-padding-y(2);
+    @include at-media("mobile-lg") {
       @include u-padding(0);
     }
   }
 
   .usa-footer__logo {
-    @include u-flex('align-center');
+    @include u-flex("align-center");
   }
 
   .usa-footer__logo-img {
@@ -251,7 +251,7 @@
   .usa-footer__contact-info {
     display: inline-block;
 
-    @include at-media('mobile-lg') {
+    @include at-media("mobile-lg") {
       @include u-padding-y(2);
       margin-top: 0;
     }
@@ -263,11 +263,11 @@
 .usa-footer--big {
   .usa-footer__nav {
     @include u-margin-x($theme-site-margins-mobile-width * -1);
-    @include at-media('mobile-lg') {
-      border-bottom: 1px solid color('base-light');
+    @include at-media("mobile-lg") {
+      border-bottom: 1px solid color("base-light");
       padding-top: units(4);
     }
-    @include at-media('tablet') {
+    @include at-media("tablet") {
       @include u-margin-x(0);
       @include u-padding-x(0);
       border-bottom: none;
@@ -276,10 +276,10 @@
 
   .usa-footer__primary-link {
     @include h4;
-    line-height: line-height('heading', 2);
+    line-height: line-height("heading", 2);
     margin: 0;
 
-    @include at-media('mobile-lg') {
+    @include at-media("mobile-lg") {
       @include u-padding-y(0);
       margin-bottom: units(1);
 
@@ -292,25 +292,25 @@
 
   .usa-footer__primary-content--collapsible {
     .usa-footer__primary-link {
+      align-items: center;
       cursor: pointer;
       display: flex;
-      align-items: center;
       justify-content: flex-start;
 
       // Arrow for collapsible content.
       &::before {
-        @include add-background-svg('arrow-down');
-        content: '';
-        display: inline-flex;
+        @include add-background-svg("arrow-down");
         align-items: center;
-        justify-content: center;
+        background-size: contain;
+        content: "";
+        display: inline-flex;
         height: units(1.5);
-        width: units(1.5);
+        justify-content: center;
         margin-right: units(1);
-        background-size: contain;
+        width: units(1.5);
       }
 
-      @include at-media('mobile-lg') {
+      @include at-media("mobile-lg") {
         &::before {
           content: none;
         }
@@ -323,12 +323,11 @@
       }
 
       .usa-footer__primary-link {
-
         &::before {
-          @include add-background-svg('arrow-right');
+          @include add-background-svg("arrow-right");
         }
 
-        @include at-media('mobile-lg') {
+        @include at-media("mobile-lg") {
           margin: 0;
         }
       }
@@ -338,7 +337,7 @@
       @include u-padding-x($theme-site-margins-mobile-width);
       padding-bottom: units(2.5);
 
-      @include at-media('mobile-lg') {
+      @include at-media("mobile-lg") {
         @include u-padding-x(0);
         padding-bottom: units(4);
         padding-top: units(1.5);

From 57ead6fb7419e4517da96b9c48cede9e06b577c8 Mon Sep 17 00:00:00 2001
From: Dano Williams <daniel.williams@gsa.gov>
Date: Mon, 18 Nov 2019 15:31:35 -0800
Subject: [PATCH 6/6] Properly scope contact info link hover

---
 src/stylesheets/components/_footer.scss | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/stylesheets/components/_footer.scss b/src/stylesheets/components/_footer.scss
index d302c13542..543b241939 100644
--- a/src/stylesheets/components/_footer.scss
+++ b/src/stylesheets/components/_footer.scss
@@ -95,10 +95,9 @@
 
   a {
     @include u-text("ink", "no-underline");
-  }
-
-  &:hover {
-    text-decoration: underline;
+    &:hover {
+      text-decoration: underline;
+    }
   }
 
   @include at-media("mobile-lg") {