Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update icebreaker styles #10723

Merged
merged 4 commits into from
Feb 6, 2025
Merged

fix: update icebreaker styles #10723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff96e29
update icebreaker line height
nickoferrall Jan 22, 2025
a5bf40c
remove global style update
nickoferrall Feb 6, 2025
1d943c1
bump line height to 2rem
nickoferrall Feb 6, 2025
42d7426
Merge branch 'master' into fix/10683/icebreaker-style
nickoferrall Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 3 additions & 28 deletions packages/client/modules/meeting/components/MeetingCheckInPrompt/NewCheckInQuestion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,30 +37,6 @@ const CogIcon = styled('div')({
width: 24
})

const QuestionBlock = styled('div')({
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While in the area, I changed this to tailwind. It's not directly relevant to the icebreaker styles

alignContent: 'center',
alignItems: 'center',
display: 'flex',
flexDirection: 'column',
fontSize: 24,
lineHeight: 1.25,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: I would bump this line-height (1.25) from 30px to 32px. 30px is a little too tight to my eyes. 36 is too much. Might at well use px units with fontSize: 24.

padding: '16px 0',
'.DraftEditor-root, textarea': {
flexGrow: 1,
padding: '16px',
borderRadius: '4px',
'&:hover': {
backgroundColor: 'rgba(255,255,255,0.2)'
},
'&:focus-within': {
backgroundColor: 'rgba(255,255,255,0.6)'
},
'.public-DraftStyleDefault-block': {
textAlign: 'center'
}
}
})

interface Props {
meeting: NewCheckInQuestion_meeting$key
}
Expand Down Expand Up @@ -187,9 +163,8 @@ const NewCheckInQuestion = (props: Props) => {

return (
<>
<QuestionBlock id='test'>
{/* cannot set min width because iPhone 5 has a width of 320*/}
<EditorContent editor={editor} onBlur={updateQuestion} />
<div className='flex flex-col items-center py-4'>
<EditorContent className='text-2xl' editor={editor} onBlur={updateQuestion} />
{isFacilitating && (
<div className='flex gap-x-2'>
<Tooltip open={isFacilitating ? undefined : false}>
Expand All @@ -214,7 +189,7 @@ const NewCheckInQuestion = (props: Props) => {
</Tooltip>
</div>
)}
</QuestionBlock>
</div>
{showAiIcebreaker && (
<div className='flex flex-col gap-4 rounded-lg bg-slate-100 p-6'>
<div className='flex flex-col items-center justify-center gap-2'>
Expand Down
14 changes: 8 additions & 6 deletions packages/client/styles/theme/global.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,16 +492,18 @@
}
}

.ProseMirror p {
margin-block-start: 4px;
margin-block-end: 4px;
line-height: 1rem;
}

hr.ProseMirror-selectednode {
border-top: 1px solid #68cef8;
}

.ProseMirror hr {
border-top: 1px solid var(--color-slate-400);
}

.ProseMirror p {
line-height: 1.25rem;
}

.text-2xl .ProseMirror p {
line-height: 2rem;
}