From 6126d7cd7f67cdcf625d3175981124fcee531385 Mon Sep 17 00:00:00 2001 From: millmason Date: Wed, 15 Jan 2025 08:58:25 -0500 Subject: [PATCH 1/3] Add tabIndex to mobile nav toggle --- src/components/MobileNav.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/MobileNav.tsx b/src/components/MobileNav.tsx index 122fe205..d7f9e9d5 100644 --- 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={ <> Menu From 0d891930de80c3b832f05e4d4cc1de04c9d55c29 Mon Sep 17 00:00:00 2001 From: millmason Date: Wed, 15 Jan 2025 10:48:52 -0500 Subject: [PATCH 2/3] Allow hover styles on screens below 640px --- src/app/globals.css | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/app/globals.css b/src/app/globals.css index 83781d1b..0850dfba 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -4,8 +4,7 @@ @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; @@ -13,8 +12,7 @@ @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; @@ -22,8 +20,7 @@ @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); } From 13dc8e8be4be19a3ca3812b5d47044de73d7f6cf Mon Sep 17 00:00:00 2001 From: millmason Date: Mon, 20 Jan 2025 10:43:21 -0500 Subject: [PATCH 3/3] Task [986]: Add notes to contributors guide to set PR base branch to staging --- docs/CONTRIBUTING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index c045ef6c..00a3329e 100644 --- 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 `/-` - 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)