Merge pull request #1084 from CodeForPhilly/staging

Weekly PR from Staging to Main
CodeForPhilly · Jan 20, 2025 · b0d9cf0 · b0d9cf0
2 parents b7cdd74 + c38bf92
commit b0d9cf0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
@@ -22,11 +22,12 @@ To ensure smooth contributions to the Clean & Green Philly project, please follo
   - Clone your fork of the repository to your local machine using `git clone`
   - Keep your fork up to date with the original repository by following the instructions [here](https://docs.github.com/en/get-started/quickstart/fork-a-repo#keep-your-fork-synced)
 - [ ] **Set up your local environment**: Follow instructions in the [SETUP](/docs/SETUP) folder
+- [ ] **Make sure you're up-to-date with the `staging` branch** To maintain repo organization and protection, merges to main are not allowed. All changes must be made through pull requests to the `staging` branch.
 - [ ] **Create a new branch**:
   - Name it `<github-username>/<issue-number>-<kebab-case-description>`
   - Example: `vimusds/1069-fix-territory-on-mobile`
 - [ ] **Work on the issue**: Make your changes, commit them, and push to your branch
-- [ ] **Open a Pull Request (PR)**: Use the provided template, tag relevant issues, and provide testing instructions
+- [ ] **Open a Pull Request (PR)**: Use the provided template, tag relevant issues, and provide testing instructions. Make sure the base branch of the PR is set to `base: staging`.
 - [ ] **Ensure all checks pass**: Fix any errors and re-check
 - [ ] **Tag reviewers**: Find appropriate reviewers from the [CODEOWNERS](https://github.com/CodeForPhilly/vacant-lots-proj/blob/main/.github/CODEOWNERS) file
 - [ ] **Close the issue**: Once your PR is merged, comment on the issue to close it, tagging the relevant reviewer(s)

diff --git a/src/app/globals.css b/src/app/globals.css
@@ -4,26 +4,23 @@
 
 @font-face {
   font-family: 'HK Grotesk';
-  src:
-    url('/fonts/hkgrotesk-bold-webfont.woff2') format('woff2'),
+  src: url('/fonts/hkgrotesk-bold-webfont.woff2') format('woff2'),
     url('/fonts/hkgrotesk-bold-webfont.woff') format('woff');
   font-weight: bold;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'HK Grotesk';
-  src:
-    url('/fonts/hkgrotesk-extrabold-webfont.woff2') format('woff2'),
+  src: url('/fonts/hkgrotesk-extrabold-webfont.woff2') format('woff2'),
     url('/fonts/hkgrotesk-extrabold-webfont.woff') format('woff');
   font-weight: 800;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'HK Grotesk';
-  src:
-    url('/fonts/hkgrotesk-regular-webfont.woff2') format('woff2'),
+  src: url('/fonts/hkgrotesk-regular-webfont.woff2') format('woff2'),
     url('/fonts/hkgrotesk-regular-webfont.woff') format('woff');
   font-weight: normal;
   font-style: normal;
@@ -147,7 +144,7 @@
   /* added webkit transform to remove icon movement in safari */
 
   .iconLink {
-    @apply text-gray-900 items-center active:bg-gray-100 active:text-green-700 focus:text-green-700 focus:bg-green-100 bg-color-none hover:bg-gray-10 rounded-medium max-sm:hover:bg-gray-0;
+    @apply text-gray-900 items-center active:bg-gray-100 active:text-green-700 focus:text-green-700 focus:bg-green-100 bg-color-none hover:bg-gray-10 rounded-medium;
     transform: translateZ(0);
     -webkit-transform: translateZ(0);
   }

diff --git a/src/components/MobileNav.tsx b/src/components/MobileNav.tsx
@@ -45,6 +45,7 @@ const MobileNav: FC = () => {
           as="nav"
           aria-label={isMenuOpen ? 'Close menu' : 'Open menu'}
           className="min-[850px]:hidden flex-end w-fit"
+          tabIndex={0}
           icon={
             <>
               <PiList className="h-6 w-6 linkIcon" /> Menu