Merge pull request #1220 from GSA/staging

Staging
GSA · Sep 27, 2024 · 2e56535 · 2e56535
2 parents c312830 + 67ca799
commit 2e56535
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 55 deletions.
diff --git a/assets/css/main-page-blue.scss b/assets/css/main-page-blue.scss
@@ -23,6 +23,7 @@
 
 .carousel-padding {
   padding-left: 40px;
+  padding-right: 40px;
 }
 
 .jfmip-logo-size {
@@ -1484,34 +1485,34 @@ a.checked {
     // }
 }
 
-@media screen and (max-width: 640px) {
-    .usa-banner__button[aria-expanded="true"]::after {
-        border: 0;
-        background-image: url("../img/close-blue-60v-alt.svg"), linear-gradient(transparent, transparent);
-        background-repeat: no-repeat;
-        background-position: center center;
-        background-size: 1rem;
-        content: '';
-        display: inline-block;
-        height: 3rem;
-        width: 3rem;
-        margin-left: 0;
-        background-color: transparent !important;
-    }
-
-    .usa-banner__header-action::after {
-        background-image: url("../img/angle-arrow-down-primary.svg"), linear-gradient(transparent, transparent);
-        background-repeat: no-repeat;
-        background-position: center center;
-        background-size: 0.5rem;
-        content: '';
-        display: inline-block;
-        height: 0.5rem;
-        width: 0.5rem;
-        margin-left: 2px;
-        background-color: transparent !important;
-    }
-}
+// @media screen and (max-width: 640px) {
+//     .usa-banner__button[aria-expanded="true"]::after {
+//         border: 0;
+//         background-image: url("../img/close-blue-60v-alt.svg"), linear-gradient(transparent, transparent);
+//         background-repeat: no-repeat;
+//         background-position: center center;
+//         background-size: 1rem;
+//         content: '';
+//         display: inline-block;
+//         height: 3rem;
+//         width: 3rem;
+//         margin-left: 0;
+//         background-color: transparent !important;
+//     }
+
+//     .usa-banner__header-action::after {
+//         background-image: url("../img/angle-arrow-down-primary.svg"), linear-gradient(transparent, transparent);
+//         background-repeat: no-repeat;
+//         background-position: center center;
+//         background-size: 0.5rem;
+//         content: '';
+//         display: inline-block;
+//         height: 0.5rem;
+//         width: 0.5rem;
+//         margin-left: 2px;
+//         background-color: transparent !important;
+//     }
+// }
 
 @media (min-width: 64em)
 {

diff --git a/assets/css/main-page-green.scss b/assets/css/main-page-green.scss
@@ -1421,6 +1421,7 @@ a.checked {
     color: #225d5a;
 }
 
+//no longer used after uswds upgrade
 // @media screen and (min-width: 640px) {
 //     .usa-banner__button[aria-expanded="true"]::after {
 //         background-color: transparent !important;
@@ -1459,34 +1460,34 @@ a.checked {
 //     }
 // }
 
-@media screen and (max-width: 640px) {
-    .usa-banner__button[aria-expanded="true"]::after {
-        border: 0;
-        background-image: url("../img/close-blue-60v-alt.svg"), linear-gradient(transparent, transparent);
-        background-repeat: no-repeat;
-        background-position: center center;
-        background-size: 1rem;
-        content: '';
-        display: inline-block;
-        height: 3rem;
-        width: 3rem;
-        margin-left: 0;
-        background-color: transparent !important;
-    }
+// @media screen and (max-width: 640px) {
+//     .usa-banner__button[aria-expanded="true"]::after {
+//         border: 0;
+//         background-image: url("../img/close-blue-60v-alt.svg"), linear-gradient(transparent, transparent);
+//         background-repeat: no-repeat;
+//         background-position: center center;
+//         background-size: 1rem;
+//         content: '';
+//         display: inline-block;
+//         height: 3rem;
+//         width: 3rem;
+//         margin-left: 0;
+//         background-color: transparent !important;
+//     }
 
-    .usa-banner__header-action::after {
-        background-image: url("../img/angle-arrow-down-primary.svg"), linear-gradient(transparent, transparent);
-        background-repeat: no-repeat;
-        background-position: center center;
-        background-size: 0.5rem;
-        content: '';
-        display: inline-block;
-        height: 0.5rem;
-        width: 0.5rem;
-        margin-left: 2px;
-        background-color: transparent !important;
-    }
-}
+//     .usa-banner__header-action::after {
+//         background-image: url("../img/angle-arrow-down-primary.svg"), linear-gradient(transparent, transparent);
+//         background-repeat: no-repeat;
+//         background-position: center center;
+//         background-size: 0.5rem;
+//         content: '';
+//         display: inline-block;
+//         height: 0.5rem;
+//         width: 0.5rem;
+//         margin-left: 2px;
+//         background-color: transparent !important;
+//     }
+// }
 
 @media (min-width: 64em)
 {