Merge pull request #1046 from Eastern-Research-Group/staging

Update main branch
Eastern-Research-Group · Dec 11, 2024 · c62747d · c62747d
2 parents a3c240e + 9f1f492
commit c62747d
Show file tree

Hide file tree

Showing 51 changed files with 2,929 additions and 3,190 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -72,7 +72,7 @@ jobs:
       # Set up node and npm
       - uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: "22"
 
       # Run front-end processes (install, lint, test, bundle)
       - name: Cache node modules
@@ -98,7 +98,7 @@ jobs:
       # Run CloudFoundry/Cloud.gov deployment
       - name: Set up Cloud Foundry CLI
         run: |
-          curl -v -L -o cf-cli_amd64.deb 'https://packages.cloudfoundry.org/stable?release=debian64&version=v7&source=github'
+          curl -v -L -o cf-cli_amd64.deb 'https://packages.cloudfoundry.org/stable?release=debian64&version=8.8.3&source=github-rel'
           sudo dpkg -i cf-cli_amd64.deb
           cf -v
           cf api https://api.fr.cloud.gov

diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -9,7 +9,7 @@ on:
 
 # Set shared environment variables
 env:
-  APP_VERSION: 2.12.0
+  APP_VERSION: 2.12.1
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -30,7 +30,7 @@ jobs:
       # Set up node and npm
       - uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: "22"
 
       # Run back-end processes (install, lint, test, bundle)
       - name: Cache server app node modules

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -78,7 +78,7 @@ jobs:
       # Set up node and npm
       - uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: "22"
 
       # Run front-end processes (install, lint, test, bundle)
       - name: Cache node modules
@@ -104,7 +104,7 @@ jobs:
       # Run CloudFoundry/Cloud.gov deployment
       - name: Set up Cloud Foundry CLI
         run: |
-          curl -v -L -o cf-cli_amd64.deb 'https://packages.cloudfoundry.org/stable?release=debian64&version=v7&source=github'
+          curl -v -L -o cf-cli_amd64.deb 'https://packages.cloudfoundry.org/stable?release=debian64&version=8.8.3&source=github-rel'
           sudo dpkg -i cf-cli_amd64.deb
           cf -v
           cf api https://api.fr.cloud.gov

diff --git a/app/client/index.html b/app/client/index.html
@@ -154,13 +154,15 @@
         font-size: 0.91rem;
       }
 
-      .menu--main .menu__link,
-      .menu--main .menu__link:visited {
-        color: #fff;
-      }
+      @media all and (min-width: 55em) {
+        .menu--main .menu__link,
+        .menu--main .menu__link:visited {
+          color: #fff;
+        }
 
-      .menu--main .menu__link:hover:visited {
-        color: #005ea2;
+        .menu--main .menu__link:hover:visited {
+          color: #005ea2;
+        }
       }
 
       .site-logo__svg {