Skip to content

Commit 4fb0af4

Browse files
asaltveitasaltveit
committed
Merge branch 'main' into 141/enhancement-optimize-volunteer-images-for-smaller-screens
merge in updates from main
2 parents 861409c + 24cb18f commit 4fb0af4

13 files changed

+68
-41
lines changed

‎index.html

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,34 @@
11
<!doctype html>
22
<html lang="en">
33
<head>
4+
5+
<!-- Basic Meta Tags -->
46
<meta charset="UTF-8" />
5-
<link rel="icon" type="image/svg+xml" href="/assets/favicon.ico" />
67
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
78
<title>CODE PDX</title>
9+
<meta name="description" content="CODE PDX is a community of developers in Portland, Oregon. We host events, workshops, and meetups to help developers learn and grow while building civic technologies to help the public." />
10+
11+
<!-- Favicon -->
12+
<link rel="icon" type="image/svg+xml" href="/assets/favicon.ico" />
13+
14+
<!-- Facebook/Other Socials Meta Tags -->
15+
<meta property="og:url" content="https://www.codepdx.org/">
16+
<meta property="og:type" content="website">
17+
<meta property="og:title" content="CODE PDX | Civic Technology Volunteer Group Based in Portland, OR">
18+
<meta property="og:description" content="CODE PDX is a community of developers in Portland, Oregon. We host events, workshops, and meetups to help developers learn and grow while building civic technologies to help the public.">
19+
<meta property="og:image" content="https://www.codepdx.org/assets/codePdx/CodePDX_logo_for_cards.webp">
20+
<meta property="og:image:type" content="image/webp">
21+
<meta property="og:image:alt" content="CODE PDX rose logo">
22+
23+
<!-- Twitter/X Meta Tags -->
24+
<meta name="twitter:card" content="summary_large_image">
25+
<meta property="twitter:domain" content="codepdx.org">
26+
<meta property="twitter:url" content="https://www.codepdx.org">
27+
<meta name="twitter:title" content="CODE PDX | Civic Technology Volunteer Group Based in Portland, OR">
28+
<meta name="twitter:description" content="CODE PDX is a community of developers in Portland, Oregon. We host events, workshops, and meetups to help developers learn and grow while building civic technologies to help the public.">
29+
<meta name="twitter:image" content="https://www.codepdx.org/assets/codePdx/CodePDX_logo_for_cards.webp">
30+
<meta property="twitter:image:alt" content="CODE PDX rose logo">
31+
832
</head>
933
<body>
1034
<div id="root"></div>

‎public/assets/codePdx/CodePDX_logo_for_cards.webp

3.68 KB
Binary file not shown.

‎public/assets/partnerLogos/technology-association-of-oregon-logo-366x105.webp

-19 KB
Binary file not shown.

‎public/assets/partnerLogos/technology-association-of-oregon-logo-600x172.webp

-31 KB
Binary file not shown.

‎public/assets/partnerLogos/technology-association-of-oregon-logo-transparent-397x90.png

20.9 KB
Loading

‎public/assets/partnerLogos/technology-association-of-oregon-logo-transparent-661x150.png

43.4 KB
Loading

‎public/assets/partnerLogos/technology-association-of-oregon-logo-transparent-darkmode-397x90.png

27.9 KB
Loading

‎public/assets/partnerLogos/technology-association-of-oregon-logo-transparent-darkmode-661x150.png

55.4 KB
Loading

‎src/components/global/Navbar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ function NavBar({ darkMode, handleThemeChange }) {
255255
</Popover>
256256
{/* dark mode toggle */}
257257
<FormControlLabel
258-
control={<DarkModeToggle checked={darkMode} onChange={handleThemeChange} />}
258+
control={<DarkModeToggle checked={darkMode} onChange={handleThemeChange} onKeyDown={(event) => {event.key === 'Enter'? handleThemeChange() : ""}}/>}
259259
/>
260260
</Toolbar>
261261
</AppBar>

‎src/components/home/VolunteerBrief.jsx

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ const volunteerGrid = [
6262

6363
const VolunteerBrief = () => {
6464
const scrollToTop = () => {
65-
window.scrollTo(0, 0);
65+
// Allow page to change before scrolling to top
66+
setTimeout(() => {window.scrollTo(0, 0)}, 400);
6667
};
6768
const theme = useTheme();
6869

@@ -112,23 +113,17 @@ const VolunteerBrief = () => {
112113
</Grid>
113114
<Button
114115
variant="contained"
116+
href="/volunteer"
117+
aria-label="Volunteer for CODE PDX"
115118
color="senary"
116119
sx={{
117120
mt: { xs: '2em', md: '2em' },
118121
mb: { xs: '1em', md: 0 }
119122
}}
120123
onClick={scrollToTop}
124+
onKeyDown={(event) => {event.key === 'Enter'? scrollToTop() : ""}}
121125
>
122-
<Link
123-
to="/volunteer"
124-
style={{
125-
textDecoration: 'none',
126-
color: 'inherit'
127-
}}
128-
aria-label="Volunteer for CODE PDX"
129-
>
130-
Volunteer
131-
</Link>
126+
Volunteer
132127
</Button>
133128
</Card>
134129
</Stack>

‎src/components/home/partners/Partners.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const Partners = () => {
1616
sx={{ typography: { xs: 'h4', sm: 'h3' } }}
1717
>
1818
Building a better tomorrow with a shared vision. Our mission would not be possible without
19-
our partners
19+
our partners:
2020
</Typography>
2121
<PrimaryPartner />
2222
<SecondaryPartners />

‎src/components/home/partners/PrimaryPartner.jsx

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -44,50 +44,59 @@ const displaySponsorValuesInGrid = ({ title, description }) => {
4444

4545
const PrimaryPartner = () => {
4646
const theme = useTheme();
47-
const isMinMd = useMediaQuery(theme.breakpoints.up('md'));
48-
const darkModeStyles = {
49-
backgroundImage:
50-
theme.palette.mode === 'dark' ? 'url(/assets/partnerLogos/backgroundBlobs/blob3.webp)' : null,
51-
backgroundRepeat: theme.palette.mode === 'dark' ? 'no-repeat' : null,
52-
backgroundPosition: theme.palette.mode === 'dark' ? 'top' : null,
53-
backgroundSize: theme.palette.mode === 'dark' ? (isMinMd ? '850px 250px' : '200% 130px') : null
54-
};
5547
return (
5648
<Container
5749
sx={{
5850
mb: '100px',
5951
borderRadius: '30px',
60-
paddingTop: theme.palette.mode === 'dark' ? '10px' : '0px',
52+
paddingTop: theme.palette.mode === 'dark' ? '50px' : '0px',
6153
background:
6254
theme.palette.mode === 'dark'
6355
? `${theme.palette.primary.cardFill}`
6456
: 'linear-gradient(180deg, rgba(217, 217, 217, 0) 24.86%, rgba(217, 217, 217, 0.4) 70.55%)',
65-
...darkModeStyles
6657
}}
6758
>
68-
<Box
69-
component="img"
70-
display={'flex'}
71-
maxWidth={'100%'}
72-
m={'auto'}
73-
alt="technology association of oregon logo"
74-
sx={{
75-
zIndex: 2,
76-
content: {
77-
xs: 'url(/assets/partnerLogos/technology-association-of-oregon-logo-366x105.webp)',
78-
md: 'url(/assets/partnerLogos/technology-association-of-oregon-logo-600x172.webp)'
79-
}
80-
}}
81-
/>
59+
<a href={'https://www.oregonif.org/'} target="_blank" rel="noopener noreferrer">
60+
{theme.palette.mode === 'dark' ?
61+
<Box
62+
component="img"
63+
display={'flex'}
64+
maxWidth={'100%'}
65+
m={'auto'}
66+
alt="Oregon Innovation Foundation logo"
67+
sx={{
68+
zIndex: 2,
69+
content: {
70+
xs: 'url(/assets/partnerLogos/technology-association-of-oregon-logo-transparent-darkmode-397x90.png)',
71+
md: 'url(/assets/partnerLogos/technology-association-of-oregon-logo-transparent-darkmode-661x150.png)'
72+
}
73+
}}
74+
/> :
75+
<Box
76+
component="img"
77+
display={'flex'}
78+
maxWidth={'100%'}
79+
m={'auto'}
80+
alt="Oregon Innovation Foundation logo"
81+
sx={{
82+
zIndex: 2,
83+
content: {
84+
xs: 'url(/assets/partnerLogos/technology-association-of-oregon-logo-transparent-397x90.png)',
85+
md: 'url(/assets/partnerLogos/technology-association-of-oregon-logo-transparent-661x150.png)'
86+
}
87+
}}
88+
/>
89+
}
90+
</a>
8291

8392
<Typography
8493
component="h3"
8594
textAlign={'center'}
8695
p={{ xs: '50px 0 50px 0', md: '75px 15% 75px 15%' }}
8796
sx={{ typography: { xs: 'h5', sm: 'h4' } }}
8897
>
89-
Empowering businesses and entrepreneurs, the TAO Foundation is creating and uniting a
90-
world-class innovation economy in Oregon and beyond.
98+
The Oregon Innovation Foundation takes a comprehensive approach to cultivating civic innovation
99+
and empowering communities through technology to drive sustainable development.
91100
</Typography>
92101
<Grid
93102
sx={{

‎src/components/home/partners/SecondaryPartners.jsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ const LargeScreenComponent = ({
9494
alt={`${company} logo`}
9595
aria-label={`${company} logo`}
9696
src={partnerLogo}
97-
mb={theme.palette.mode === 'dark' ? 0 : '150px'}
9897
width={'250px'}
9998
></Box>
10099
</a>

0 commit comments

Comments
 (0)