Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
probablyangg committed Aug 29, 2024
1 parent 4248719 commit 36dff15
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 30 deletions.
15 changes: 10 additions & 5 deletions src/gatsby-plugin-theme-ui/components.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,15 @@ import { ConnectButton } from '@modules/pageMoneySpeech/'
import { motion } from 'framer-motion'
import { Box, Divider, Flex, Image, jsx, Text } from 'theme-ui'


import {Intro} from '@modules/landing'
import {Heading1, Heading2, Heading3, Heading4, Heading5, Heading, Subtitle} from '@modules/ui/heading'
import {
Heading1,
Heading2,
Heading3,
Heading4,
Heading5,
Heading,
Subtitle,
} from '@modules/ui/heading'

//Markdown Component overrides
//Replace MDX html defaults with our custom implementation.
Expand Down Expand Up @@ -105,13 +111,12 @@ const Custom_Components = {
Card,
AudioPlayer,
ConnectButton,
Intro,
Heading1,
Heading2,
Heading3,
Heading4,
Heading5,
Subtitle
Subtitle,
}

const overridesAndComponents = {
Expand Down
16 changes: 14 additions & 2 deletions src/gatsby-plugin-theme-ui/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -256,10 +256,22 @@ export default {
},
xicon: {
path: (
<svg xmlns="http://www.w3.org/2000/svg" shapeRendering="geometricPrecision" textRendering="geometricPrecision" imageRendering="optimizeQuality" fillRule="evenodd" clipRule="evenodd" viewBox="0 0 512 462.799"><path fillRule="nonzero" d="M403.229 0h78.506L310.219 196.04 512 462.799H354.002L230.261 301.007 88.669 462.799h-78.56l183.455-209.683L0 0h161.999l111.856 147.88L403.229 0zm-27.556 415.805h43.505L138.363 44.527h-46.68l283.99 371.278z"/></svg>
<svg
xmlns="http://www.w3.org/2000/svg"
shapeRendering="geometricPrecision"
textRendering="geometricPrecision"
imageRendering="optimizeQuality"
fillRule="evenodd"
clipRule="evenodd"
viewBox="0 0 512 462.799">
<path
fillRule="nonzero"
d="M403.229 0h78.506L310.219 196.04 512 462.799H354.002L230.261 301.007 88.669 462.799h-78.56l183.455-209.683L0 0h161.999l111.856 147.88L403.229 0zm-27.556 415.805h43.505L138.363 44.527h-46.68l283.99 371.278z"
/>
</svg>
),
viewBox: '0 0 12 12',
}
},
}, //<- Icon package
colors: {
...maker.colors, //<- Deconstruct maker.colors so default colors aren't lost.
Expand Down
50 changes: 27 additions & 23 deletions src/modules/fellows/Fellows.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ const Fellows = () => {
borderRadius: 'medium',
marginX: ['2rem', '2rem', '0rem'],
}}>

<Flex>
<Grid
id="fellowContainer"
Expand All @@ -35,9 +34,8 @@ const Fellows = () => {
scrollBehavior: 'smooth',
scrollbarWidth: 'none',
webkitScrollbarWidth: 'none',
alignContent: 'center'
alignContent: 'center',
}}>

{originalArray.fellows.map((fellow, index) => (
<Flex
key={index}
Expand All @@ -48,29 +46,35 @@ const Fellows = () => {
// minHeight: [60, 140],
// maxHeight: [60, 140],
height: '100%',
justifyContent: 'space-between'
justifyContent: 'space-between',
}}>
<Image
src={fellow.image}
<Image
src={fellow.image}
sx={{
borderRadius: '10%',
marginX: 'auto',
marginBottom: '0.5rem',
}}
/>
<Flex sx={{ flexDirection: 'column', height: '100%' }}>
<Flex
sx={{
borderRadius: '10%',
marginX: 'auto',
marginBottom: '0.5rem',
}}
/>
<Flex sx={{flexDirection: 'column', height: '100%'}}>
<Flex sx={{flexDirection: 'row', alignItems: 'center', rowGap: '4px', justifyContent: 'space-between'}}>
<Text variant='h4'>
{fellow.name}
</Text>
<Text sx={{ ':hover': {cursor: 'pointer'} }} onClick={() => {window.open(fellow.url, '_blank')}}>
<Icon size={3} name="xicon" />
</Text>
</Flex>
<Subtitle>
{fellow.association || "Fellow"}
</Subtitle>
flexDirection: 'row',
alignItems: 'center',
rowGap: '4px',
justifyContent: 'space-between',
}}>
<Text variant="h4">{fellow.name}</Text>
<Text
sx={{ ':hover': { cursor: 'pointer' } }}
onClick={() => {
window.open(fellow.url, '_blank')
}}>
<Icon size={3} name="xicon" />
</Text>
</Flex>
<Subtitle>{fellow.association || 'Fellow'}</Subtitle>
</Flex>
</Flex>
))}
</Grid>
Expand Down

0 comments on commit 36dff15

Please sign in to comment.