Skip to content

Commit

Permalink
Merge branch 'main' into sync-5d2f7105
Browse files Browse the repository at this point in the history
  • Loading branch information
nafistiham authored Feb 5, 2024
2 parents f8670f0 + fc0bf2c commit 8ac838d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
6 changes: 0 additions & 6 deletions src/components/Layout/Page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,9 @@ export function Page({children, toc, routeTree, meta, section}: PageProps) {
}
{showSurvey && (
<>
<<<<<<< HEAD
<div className="flex flex-col items-center m-4 p-4">
<p className="font-bold text-primary dark:text-primary-dark text-lg mb-4">
এই ডকুমেন্টেশনগুলো আপনার কতটুকু ভাল লাগছে?
=======
<div className="flex flex-col items-center p-4 m-4">
<p className="mb-4 text-lg font-bold text-primary dark:text-primary-dark">
How do you like these docs?
>>>>>>> 5d2f7105bd6374e465b8bdce8efceaeb8f01c937
</p>
<div>
<ButtonLink
Expand Down
5 changes: 5 additions & 0 deletions src/content/community/team.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ Current members of the React team are listed in alphabetical order below.
Josh majored in Mathematics and discovered programming while in college. His first professional developer job was to program insurance rate calculations in Microsoft Excel, the paragon of Reactive Programming which must be why he now works on React. In between that time Josh has been an IC, Manager, and Executive at a few startups. outside of work he likes to push his limits with cooking.
</TeamMember>

<TeamMember name="Kathryn Middleton" permalink="kathryn-middleton" photo="/images/team/kathryn-middleton.jpg" github="kmiddleton14" twitter="kmiddleton14" title="Engineering Manager at Meta">
Kathryn initially discovered web development when she wanted to make her myspace page look cool. She ended up majoring in Computer Science, and quickly became a huge fan of React building features on the Instagram.com team. Outside of work she loves playing pingpong, teaching spin classes, and going plant shopping.
</TeamMember>

<TeamMember name="Lauren Tan" permalink="lauren-tan" photo="/images/team/lauren.jpg" github="poteto" twitter="potetotes" threads="potetotes" personal="no.lol" title="Engineer at Meta">
Lauren’s programming career peaked when she first discovered the `<marquee>` tag. She’s been chasing that high ever since. When she’s not adding bugs into React, she enjoys dropping cheeky memes in chat, and playing all too many video games with her partner, and her dog Zelda.
</TeamMember>
Expand All @@ -64,6 +68,7 @@ Current members of the React team are listed in alphabetical order below.

<TeamMember name="Rick Hanlon" permalink="rick-hanlon" photo="/images/team/rickhanlonii.jpg" github="rickhanlonii" twitter="rickhanlonii" threads="rickhanlonii" personal="rickhanlon.codes" title="Engineer at Meta">
Ricky majored in theoretical math and somehow found himself on the React Native team for a couple years before joining the React team. When he's not programming you can find him snowboarding, biking, climbing, golfing, or closing GitHub issues that do not match the issue template.

</TeamMember>

<TeamMember name="Sathya Gunasekaran " permalink="sathya-gunasekaran" photo="/images/team/sathya.jpg" github="gsathya" twitter="_gsathya" threads="gsathya.03" title="Engineer at Meta">
Expand Down

0 comments on commit 8ac838d

Please sign in to comment.