Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/onboard-card' into onboard-card
Browse files Browse the repository at this point in the history
# Conflicts:
#	pages/index.js
  • Loading branch information
tobyab committed Nov 16, 2023
2 parents fc2f89d + 6fef38f commit 9339ed5
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ import GitHub from '../components/index/github'
import Photo from '../components/photo'
import Comma from '../components/comma'
import Haxidraw from '../components/index/cards/haxidraw'
import Haunted from '../components/index/cards/haunted'
import Onboard from '../components/index/cards/onboard'

/** @jsxImportSource theme-ui */

Expand Down Expand Up @@ -630,6 +632,7 @@ function Page({
and make things together!
</Text>
</Box>
<Haunted />
<Pizza />
<Slack slackKey={slackKey} data={slackData} events={events} />
</Box>
Expand Down Expand Up @@ -746,6 +749,7 @@ function Page({
gameImage={gameImage}
gameImage1={gameImage1}
/>
<Onboard />
<Haxidraw stars={stars.blot.stargazerCount} delay={100} />
<Sinerider delay={200} stars={stars.sinerider.stargazerCount} />
<Box as="section" id="sprig">
Expand Down

0 comments on commit 9339ed5

Please sign in to comment.