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

Updated Past Events Font-Color to Primary for Visibility #5572

Merged
merged 17 commits into from
May 27, 2024
Merged

Updated Past Events Font-Color to Primary for Visibility #5572

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
90e5ab3
Changed record chip functionality from onClick to anchor tag
ktang520 May 18, 2024
568a6b1
Revert "Changed record chip functionality from onClick to anchor tag"
FelixMalfait May 18, 2024
dcafacb
Implement at Chip level
FelixMalfait May 19, 2024
9e82859
Left side menu
FelixMalfait May 19, 2024
170eb95
Settings field (begin)
FelixMalfait May 19, 2024
1c6fd2e
Settings page
FelixMalfait May 19, 2024
2be3da6
Remove unused navigate
FelixMalfait May 19, 2024
5caa6d8
Fix JS errors
FelixMalfait May 20, 2024
aedad8b
Integrations page
FelixMalfait May 20, 2024
6e217cd
Developers page
FelixMalfait May 20, 2024
ce994d5
Change API key default expiration
FelixMalfait May 20, 2024
adeb9ed
Object settings
FelixMalfait May 20, 2024
63e3973
More integration
FelixMalfait May 20, 2024
cbbda1e
Merge branch 'twentyhq:main' into main
Shyesta May 24, 2024
f2d7ce3
Merge branch 'twentyhq:main' into main
Shyesta May 24, 2024
67780b0
Updated Calendar event title from tertiary font to primary font
Shyesta May 24, 2024
9524a57
Merge branch 'twentyhq:main' into main
Shyesta May 27, 2024
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
3 changes: 2 additions & 1 deletion packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,15 @@ const StyledAttendanceIndicator = styled.div<{ active?: boolean }>`
const StyledLabels = styled.div`
align-items: center;
display: flex;
color: ${({ theme }) => theme.font.color.tertiary};
color: ${({ theme }) => theme.font.color.primary};
Copy link
Member

Choose a reason for hiding this comment

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

based on the issue, it seems that we want secondary and not primary?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I had a back and forth conversation with another member of Twenty in the comments of the original issue who said that primary looked better from the screenshots I posted.

Copy link
Member

Choose a reason for hiding this comment

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

Ok, I missed it, LGTM!

gap: ${({ theme }) => theme.spacing(2)};
flex: 1 0 auto;
`;

const StyledTime = styled.div`
align-items: center;
display: flex;
color: ${({ theme }) => theme.font.color.tertiary};
gap: ${({ theme }) => theme.spacing(1)};
width: ${({ theme }) => theme.spacing(26)};
`;
Expand Down
Loading