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: Booking confirmation: Cancelled event icon regression #14018

Merged
merged 12 commits into from
Mar 12, 2024
Merged

fix: Booking confirmation: Cancelled event icon regression #14018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4743e29
fix: #14016
ASQUAREEE Mar 7, 2024
26b529a
Merge branch 'main' of github.com:ASQUAREEE/cal.com
ASQUAREEE Mar 7, 2024
ede5a3c
fix: #14016
ASQUAREEE Mar 7, 2024
5fdbd3a
Update yarn.lock
keithwillcode Mar 7, 2024
038df43
Merge branch 'main' into main
PeerRich Mar 7, 2024
d9fa438
fix: #14016
ASQUAREEE Mar 7, 2024
d465294
Merge branch 'main' of github.com:ASQUAREEE/cal.com
ASQUAREEE Mar 7, 2024
8c245ca
Merge branch 'main' into main
Udit-takkar Mar 8, 2024
9bb8fd0
fix: cancelled icon
Udit-takkar Mar 8, 2024
705cb09
chore: remove svg
Udit-takkar Mar 8, 2024
b409899
Merge branch 'main' into main
PeerRich Mar 11, 2024
4bb1d77
Merge branch 'main' into main
Udit-takkar Mar 12, 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
2 changes: 1 addition & 1 deletion apps/web/modules/bookings/views/bookings-single-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ export default function Success(props: PageProps) {
!giphyImage && !isCancelled && needsConfirmation
? "bg-subtle h-12 w-12 rounded-full"
: "",
isCancelled ? "bg-error h-12 w-12 rounded-full" : ""
isCancelled ? "bg-error h-12 w-12 rounded-full " : ""
)}>
{giphyImage && !needsConfirmation && !isCancelled && (
// eslint-disable-next-line @next/next/no-img-element
Expand Down
4 changes: 2 additions & 2 deletions apps/web/styles/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
--cal-bg-info: hsla(218,83%,98%,1);
--cal-bg-success: hsla(134,76%,94%,1);
--cal-bg-attention: hsla(37, 86%, 92%, 1);
--cal-bg-error: hsla(3,66,93,1);
--cal-bg-error: hsla(3,66%,93%,1);
Copy link
Contributor

Choose a reason for hiding this comment

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

This was the bug in light mode. I have removed the svg that you added

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you

--cal-bg-dark-error: hsla(2, 55%, 30%, 1);

/* Borders */
Expand Down Expand Up @@ -95,7 +95,7 @@

@layer base {
* {
@apply border-default
@apply border-default
}
}

Expand Down
Loading