diff --git a/src/features/auth/components/SignUpForm.tsx b/src/features/auth/components/SignUpForm.tsx index be09f74f..a06a59be 100644 --- a/src/features/auth/components/SignUpForm.tsx +++ b/src/features/auth/components/SignUpForm.tsx @@ -125,7 +125,7 @@ function SignUpForm({ isLoading, onCancel, onSignUp }: Props) { Continue With Google - + ); } diff --git a/src/features/climate-feed/components/ClimateDetailsModal.tsx b/src/features/climate-feed/components/ClimateDetailsModal.tsx index 68507d67..8f3f5969 100644 --- a/src/features/climate-feed/components/ClimateDetailsModal.tsx +++ b/src/features/climate-feed/components/ClimateDetailsModal.tsx @@ -51,7 +51,7 @@ function ClimateDetailsModal({ showDetails, effectTitle, effectDescription, effe {capitalizeFirstLetter(effectTitle)} - {effectTitle} + {imageUrl && {effectTitle}} {effectSolutions.map((solution) => ( -
- +
+
))} @@ -72,9 +72,9 @@ function ClimateDetailsModal({ showDetails, effectTitle, effectDescription, effe } sources={ -
+
{effectSources.map((source, index) => ( - {source} + {source} ))}
} @@ -112,10 +112,13 @@ const styles: { [key: string]: React.CSSProperties } = { maxHeight: 360, objectFit: 'cover', }, - link: { + source: { + cursor: 'pointer', fontWeight: 600, + paddingTop: 20, textDecoration: 'underline', - cursor: 'pointer', + wordBreak: 'break-word', + whiteSpace: 'pre-wrap', } }; diff --git a/src/features/myth-feed/components/MythDetailsModal.tsx b/src/features/myth-feed/components/MythDetailsModal.tsx index b04dd71a..6109517a 100644 --- a/src/features/myth-feed/components/MythDetailsModal.tsx +++ b/src/features/myth-feed/components/MythDetailsModal.tsx @@ -36,7 +36,7 @@ function MythDetailsModal({ showDetails, mythTitle, mythRebuttal, faultyLogicDes sources={
{mythSources.map((source, index) => ( - {source} + {source} ))}
} @@ -72,10 +72,13 @@ const styles: { [key: string]: React.CSSProperties } = { letterSpacing: 1.2, lineHeight: 1.5, }, - link: { + source: { + cursor: 'pointer', fontWeight: 600, + paddingTop: 20, textDecoration: 'underline', - cursor: 'pointer', + wordBreak: 'break-word', + whiteSpace: 'pre-wrap', } }; diff --git a/src/features/quiz/components/PersonalValueCardSmall.tsx b/src/features/quiz/components/PersonalValueCardSmall.tsx index 7f15389f..40e81b85 100644 --- a/src/features/quiz/components/PersonalValueCardSmall.tsx +++ b/src/features/quiz/components/PersonalValueCardSmall.tsx @@ -20,8 +20,8 @@ function PersonalValueCardSmall({ valueName, shortDescription, subTitle }: Props {`${valueName}
- {capitalizeFirstLetter(valueName)} - {subTitle} + {capitalizeFirstLetter(valueName)} + {subTitle}
setExpanded(!expanded)} style={{ cursor: 'pointer', marginRight: 20, display: 'flex', flexDirection: 'column', alignItems: 'center' }}> @@ -47,8 +47,8 @@ const styles: { [key: string]: React.CSSProperties } = { justifyContent: 'space-between', }, image: { - width: 80, - height: 80, + width: 70, + height: 70, margin: 20, }, textContainer: { diff --git a/src/features/solution-feed/components/SolutionDetailsModal.tsx b/src/features/solution-feed/components/SolutionDetailsModal.tsx index 13824b8e..1fd87ccc 100644 --- a/src/features/solution-feed/components/SolutionDetailsModal.tsx +++ b/src/features/solution-feed/components/SolutionDetailsModal.tsx @@ -31,7 +31,7 @@ function SolutionDetailsModal({ showDetails, solutionTitle, solutionType, imageU - {solutionTitle} + {imageUrl && {solutionTitle}} } sources={ -
+
{solutionSources.map((source, index) => ( - {source} + {source} ))}
} @@ -92,10 +92,13 @@ const styles: { [key: string]: React.CSSProperties } = { maxHeight: 360, objectFit: 'cover', }, - link: { + source: { + cursor: 'pointer', fontWeight: 600, + paddingTop: 20, textDecoration: 'underline', - cursor: 'pointer', + wordBreak: 'break-word', + whiteSpace: 'pre-wrap', } }; diff --git a/src/features/userB/components/UserBSharedImpactCard.tsx b/src/features/userB/components/UserBSharedImpactCard.tsx index ccd5f8cf..7e4df091 100644 --- a/src/features/userB/components/UserBSharedImpactCard.tsx +++ b/src/features/userB/components/UserBSharedImpactCard.tsx @@ -25,7 +25,7 @@ function UserBSharedImpactCard({ effectId, effectTitle, effectShortDescription, {effectShortDescription} -
+
{relatedPersonalValues.map((value: string) => ( @@ -49,6 +49,7 @@ const styles: { [key: string]: React.CSSProperties } = { title: { textAlign: 'left', paddingLeft: 20, + paddingRight: 20, }, image: { width: '100%', diff --git a/src/features/userB/components/UserBSharedImpactDetailsModal.tsx b/src/features/userB/components/UserBSharedImpactDetailsModal.tsx index 2df6c39e..0604e175 100644 --- a/src/features/userB/components/UserBSharedImpactDetailsModal.tsx +++ b/src/features/userB/components/UserBSharedImpactDetailsModal.tsx @@ -44,6 +44,7 @@ function UserBSharedImpactDetailsModal({ showDetails, effectId, effectTitle, ima {capitalizeFirstLetter(effectTitle)} + {imageUrl && {effectTitle}} } sources={ -
+
{sources.map((source, index) => ( - {source} + {source} ))}
} @@ -93,10 +94,13 @@ const styles: { [key: string]: React.CSSProperties } = { maxHeight: 360, objectFit: 'cover', }, - link: { + source: { + cursor: 'pointer', fontWeight: 600, + paddingTop: 20, textDecoration: 'underline', - cursor: 'pointer', + wordBreak: 'break-word', + whiteSpace: 'pre-wrap', } }; diff --git a/src/features/userB/components/UserBSharedSolutionCard.tsx b/src/features/userB/components/UserBSharedSolutionCard.tsx index 09fb91c1..a8a101be 100644 --- a/src/features/userB/components/UserBSharedSolutionCard.tsx +++ b/src/features/userB/components/UserBSharedSolutionCard.tsx @@ -50,6 +50,7 @@ const styles: { [key: string]: React.CSSProperties } = { title: { textAlign: 'left', paddingLeft: 20, + paddingRight: 20, }, image: { width: '100%', diff --git a/src/features/userB/components/UserBSharedSolutionDetailsModal.tsx b/src/features/userB/components/UserBSharedSolutionDetailsModal.tsx index 54b2eeb6..918f2d9f 100644 --- a/src/features/userB/components/UserBSharedSolutionDetailsModal.tsx +++ b/src/features/userB/components/UserBSharedSolutionDetailsModal.tsx @@ -44,6 +44,7 @@ function UserBSharedSolutionDetailsModal({ showDetails, solutionId, solutionTitl + {imageUrl && {solutionTitle}} } sources={ -
+
{solutionSources.map((source, index) => ( - {source} + {source} ))}
} @@ -90,10 +91,13 @@ const styles: { [key: string]: React.CSSProperties } = { maxHeight: 360, objectFit: 'cover', }, - link: { + source: { + cursor: 'pointer', fontWeight: 600, + paddingTop: 20, textDecoration: 'underline', - cursor: 'pointer', + wordBreak: 'break-word', + whiteSpace: 'pre-wrap', } }; diff --git a/src/pages/UserAAuthorizedPages/ConversationsPage.tsx b/src/pages/UserAAuthorizedPages/ConversationsPage.tsx index 1f5ab14f..4048abcb 100644 --- a/src/pages/UserAAuthorizedPages/ConversationsPage.tsx +++ b/src/pages/UserAAuthorizedPages/ConversationsPage.tsx @@ -57,7 +57,6 @@ function ConversationsPage() { value={friendsName} onChange={(e) => setFriendsName(e.target.value)} helperText={friendsName.length > 20 && 'Name must be less than 20 characters'} - fullWidth={false} style={{ marginTop: 30, marginBottom: 30 }} /> @@ -84,6 +83,7 @@ const styles: { [key: string]: React.CSSProperties } = { display: 'flex', flexDirection: 'column', alignItems: 'center', + width: '100%', }, openDrawerButton: { backgroundColor: '#D0EEEB',