-
-
{t('vacay.inviteUser')}
-
-
-
-
+
}
+ title={t('vacay.inviteUser')}
+ onClose={onClose}
+ closeLabel={t('common.close')}
+ />
{t('vacay.inviteHint')}
diff --git a/client/src/mobile/screens/vacay/MVacaySettingsSheet.tsx b/client/src/mobile/screens/vacay/MVacaySettingsSheet.tsx
index dd0097eea..e063a3b1f 100644
--- a/client/src/mobile/screens/vacay/MVacaySettingsSheet.tsx
+++ b/client/src/mobile/screens/vacay/MVacaySettingsSheet.tsx
@@ -1,5 +1,5 @@
import { useEffect, useMemo, useState } from 'react'
-import { ArrowRightLeft, Building2, Calendar, CalendarRange, CalendarX, ChevronDown, Globe, GraduationCap, Loader2, Plus, Trash2, Unlink, X } from 'lucide-react'
+import { ArrowRightLeft, Building2, Calendar, CalendarRange, CalendarX, ChevronDown, Globe, GraduationCap, Loader2, Plus, Trash2, Unlink, X, Settings2 } from 'lucide-react'
import MSheet from '../../components/MSheet'
import MIconBtn from '../../components/MIconBtn'
import MToggle from '../../components/MToggle'
@@ -13,6 +13,7 @@ import {
} from '../../../components/Vacay/useVacaySettings'
import { FALLBACK_PERSON_COLOR } from './vacayDayModel'
import type { VacayHolidayCalendar } from '../../../types'
+import { INNER_CLS, TileHeader } from '../trip/sheets/MTripSheetUi'
const CALENDAR_COLORS = ['#fecaca', '#fed7aa', '#fde68a', '#bbf7d0', '#a5f3fc', '#c7d2fe', '#e9d5ff', '#fda4af']
@@ -28,6 +29,9 @@ interface MVacaySettingsSheetProps {
* start, carry-over, company holidays, public-holiday calendars (nager.at —
* label/color/country/region, several) and dissolving the Fusion.
*/
+/** Each setting is a card on the inner surface, as the trip settings' sections. */
+const CARD = `flex-none rounded-[18px] px-3 pb-1 ${INNER_CLS}`
+
export default function MVacaySettingsSheet({ open, onClose }: MVacaySettingsSheetProps) {
const { t, language } = useTranslation()
const { plan, updatePlan, addHolidayCalendar, updateHolidayCalendar, deleteHolidayCalendar, isFused, users } = useVacayStore()
@@ -52,15 +56,18 @@ export default function MVacaySettingsSheet({ open, onClose }: MVacaySettingsShe
]
return (
-
-
-
{t('vacay.settings')}
-
-
-
+
+
+ }
+ title={t('vacay.settings')}
+ onClose={onClose}
+ closeLabel={t('common.close')}
+ />
-
+
+
{/* Block weekends */}
@@ -94,7 +101,8 @@ export default function MVacaySettingsSheet({ open, onClose }: MVacaySettingsShe
>
)}
-
+
+
{/* Week start */}
@@ -121,7 +129,8 @@ export default function MVacaySettingsSheet({ open, onClose }: MVacaySettingsShe
})}
-
+
+
{/* Carry over */}
@@ -132,11 +141,13 @@ export default function MVacaySettingsSheet({ open, onClose }: MVacaySettingsShe
updatePlan({ carry_over_enabled: !plan.carry_over_enabled })} ariaLabel={t('vacay.carryOver')} />
-
+
+
{/* Vacation year (#737) — personal, unlike the plan settings around it */}
-
+
+
{/* Company holidays */}
@@ -147,7 +158,8 @@ export default function MVacaySettingsSheet({ open, onClose }: MVacaySettingsShe
updatePlan({ company_holidays_enabled: !plan.company_holidays_enabled })} ariaLabel={t('vacay.companyHolidays')} />
-
+
+
{/* Public holidays + calendar editor */}
@@ -189,7 +201,8 @@ export default function MVacaySettingsSheet({ open, onClose }: MVacaySettingsShe
)}
>
)}
-
+
+
{/* School holidays + calendar editor */}
@@ -233,6 +246,8 @@ export default function MVacaySettingsSheet({ open, onClose }: MVacaySettingsShe
>
)}
+
+
{/* Dissolve Fusion */}
{isFused && (
diff --git a/client/src/mobile/screens/vacay/MVacayShareSheet.tsx b/client/src/mobile/screens/vacay/MVacayShareSheet.tsx
index b31f9238b..88d2d4f50 100644
--- a/client/src/mobile/screens/vacay/MVacayShareSheet.tsx
+++ b/client/src/mobile/screens/vacay/MVacayShareSheet.tsx
@@ -1,11 +1,11 @@
-import { ChevronDown, Eye, EyeOff, Loader2, Share2, X } from 'lucide-react'
+import { ChevronDown, Eye, EyeOff, Loader2, Share2 } from 'lucide-react'
import MSheet from '../../components/MSheet'
-import MIconBtn from '../../components/MIconBtn'
import MUserPickerList from '../../components/MUserPickerList'
import { useVacayStore } from '../../../store/vacayStore'
import { useTranslation } from '../../../i18n'
import { useVacayShareActions } from '../../../components/Vacay/useVacayShareActions'
import { useVacayUserPicker } from '../../../components/Vacay/useVacayUserPicker'
+import { TileHeader } from '../trip/sheets/MTripSheetUi'
interface MVacayShareSheetProps {
open: boolean
@@ -34,12 +34,12 @@ export default function MVacayShareSheet({ open, onClose }: MVacayShareSheetProp
return (
-
-
{t('vacay.sharedCalendars')}
-
-
-
-
+
}
+ title={t('vacay.sharedCalendars')}
+ onClose={onClose}
+ closeLabel={t('common.close')}
+ />
{t('vacay.shareCalendarHint')}