From db4b32119e278ae9d7923de878c24a58cd813fd7 Mon Sep 17 00:00:00 2001 From: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Date: Sat, 10 Jun 2023 02:02:35 +0530 Subject: [PATCH] fix: UI bugs (#9435) * fix: toggle group background Signed-off-by: Udit Takkar * fix: background Signed-off-by: Udit Takkar * chore Signed-off-by: Udit Takkar * fix: confirm modal Signed-off-by: Udit Takkar * fix: dark mode footer Signed-off-by: Udit Takkar * fix: change tootltip Signed-off-by: Udit Takkar --------- Signed-off-by: Udit Takkar --- apps/web/public/static/locales/en/common.json | 1 + .../Booker/components/BookEventForm/BookFormAsModal.tsx | 2 +- packages/features/bookings/Booker/components/Header.tsx | 2 +- packages/ui/components/dialog/Dialog.tsx | 2 +- packages/ui/components/form/toggleGroup/ToggleGroup.tsx | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json index 762f2b5f89..ffe979efbf 100644 --- a/apps/web/public/static/locales/en/common.json +++ b/apps/web/public/static/locales/en/common.json @@ -1694,6 +1694,7 @@ "switch_monthly": "Switch to monthly view", "switch_weekly": "Switch to weekly view", "switch_multiday": "Switch to day view", + "switch_columnview": "Switch to column view", "num_locations": "{{num}} location options", "select_on_next_step": "Select on the next step", "this_meeting_has_not_started_yet": "This meeting has not started yet", diff --git a/packages/features/bookings/Booker/components/BookEventForm/BookFormAsModal.tsx b/packages/features/bookings/Booker/components/BookEventForm/BookFormAsModal.tsx index 346ee48a57..474604e629 100644 --- a/packages/features/bookings/Booker/components/BookEventForm/BookFormAsModal.tsx +++ b/packages/features/bookings/Booker/components/BookEventForm/BookFormAsModal.tsx @@ -20,7 +20,7 @@ export function BookFormAsModal({ visible, onCancel }: { visible: boolean; onCan + className="[&_.modalsticky]:border-t-subtle [&_.modalsticky]:bg-default max-h-[80vh] pb-0 [&_.modalsticky]:sticky [&_.modalsticky]:bottom-0 [&_.modalsticky]:left-0 [&_.modalsticky]:right-0 [&_.modalsticky]:-mx-8 [&_.modalsticky]:border-t [&_.modalsticky]:px-8 [&_.modalsticky]:py-4">

{t("confirm_your_details")}

diff --git a/packages/features/bookings/Booker/components/Header.tsx b/packages/features/bookings/Booker/components/Header.tsx index 51799f4a86..0fb4aaf68a 100644 --- a/packages/features/bookings/Booker/components/Header.tsx +++ b/packages/features/bookings/Booker/components/Header.tsx @@ -122,7 +122,7 @@ const LayoutToggle = ({ { value: BookerLayouts.COLUMN_VIEW, label: , - tooltip: t("switch_multiday"), + tooltip: t("switch_columnview"), }, ].filter((layout) => enabledLayouts?.includes(layout.value as BookerLayouts)); }, [t, enabledLayouts]); diff --git a/packages/ui/components/dialog/Dialog.tsx b/packages/ui/components/dialog/Dialog.tsx index f7d12aeb66..6863084663 100644 --- a/packages/ui/components/dialog/Dialog.tsx +++ b/packages/ui/components/dialog/Dialog.tsx @@ -77,7 +77,7 @@ export const DialogContent = React.forwardRef @@ -50,7 +50,7 @@ export const ToggleGroup = ({ options, onValueChange, isFullWidth, ...props }: T disabled={option.disabled} value={option.value} className={classNames( - "aria-checked:bg-subtle relative rounded-[4px] px-3 py-1 text-sm leading-tight transition-colors", + "aria-checked:bg-emphasis relative rounded-[4px] px-3 py-1 text-sm leading-tight transition-colors", option.disabled ? "text-gray-400 hover:cursor-not-allowed" : "text-default [&[aria-checked='false']]:hover:bg-emphasis",