Merge branch 'dev' into mardownCheckerFixes

wackerow · web-flow · commit c77f3d049586 · 2024-01-17T20:41:43.000-06:00
diff --git a/src/components/MeetupList.tsx b/src/components/MeetupList.tsx
@@ -128,7 +128,7 @@ const MeetupList: React.FC<IProps> = () => {
               me={4}
               flexWrap="wrap"
             >
-              <Emoji text={meetup.emoji} boxSize={4} me={2} />
+              <Emoji text={meetup.emoji} boxSize={4} me={2} lineHeight="unset" />
               <Text mb={0} opacity={"0.6"}>
                 {meetup.location}
               </Text>
diff --git a/src/scripts/crowdin-import.ts b/src/scripts/crowdin-import.ts
@@ -64,6 +64,7 @@ type BucketsList = { [key: string]: Array<number> }
 const USER_OVERRIDE: BucketsList = {
   // FORMAT: lang_code: [bucket_number, bucket_number, ...],
   // EXAMPLE: es: [1, 10, 12, 14],
+
 }
 
 /******************************

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ const MeetupList: React.FC<IProps> = () => {`
`128`	`128`	`me={4}`
`129`	`129`	`flexWrap="wrap"`
`130`	`130`	`>`
`131`		`- <Emoji text={meetup.emoji} boxSize={4} me={2} />`
	`131`	`+ <Emoji text={meetup.emoji} boxSize={4} me={2} lineHeight="unset" />`
`132`	`132`	`<Text mb={0} opacity={"0.6"}>`
`133`	`133`	`{meetup.location}`
`134`	`134`	`</Text>`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ type BucketsList = { [key: string]: Array<number> }`
`64`	`64`	`const USER_OVERRIDE: BucketsList = {`
`65`	`65`	`// FORMAT: lang_code: [bucket_number, bucket_number, ...],`
`66`	`66`	`// EXAMPLE: es: [1, 10, 12, 14],`
	`67`	`+`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`/******************************`