diff --git a/resources/css/app.css b/resources/css/app.css index 003999e..ae92610 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -15,37 +15,50 @@ display: none !important; } -.meet-toolbar-icon { +/* App shell: always light (ignore OS dark mode). Live meeting keeps dark UI. */ +html.app-shell { + color-scheme: light; +} + +html.app-shell :is(input, select, textarea) { + color-scheme: light; +} + +html.meet-room-page { + color-scheme: dark; +} + +.meet-room-page .meet-toolbar-icon { filter: brightness(0) invert(1); opacity: 0.92; } -.meet-chat-bubble { +.meet-room-page .meet-chat-bubble { max-width: 85%; } -.meet-chat-bubble--own { +.meet-room-page .meet-chat-bubble--own { margin-left: auto; } -.meet-tile-speaking { +.meet-room-page .meet-tile-speaking { box-shadow: 0 0 0 2px rgb(52 211 153 / 0.9); } -.meet-speaking-bar { +.meet-room-page .meet-speaking-bar { transform-origin: center bottom; animation: meet-speaking-pulse 0.9s ease-in-out infinite; } -.meet-speaking-bar--1 { +.meet-room-page .meet-speaking-bar--1 { animation-delay: 0s; } -.meet-speaking-bar--2 { +.meet-room-page .meet-speaking-bar--2 { animation-delay: 0.15s; } -.meet-speaking-bar--3 { +.meet-room-page .meet-speaking-bar--3 { animation-delay: 0.3s; } @@ -64,7 +77,7 @@ /* Meeting room footer */ @media (max-width: 639px) { - .meet-toolbar__track { + .meet-room-page .meet-toolbar__track { display: flex; align-items: center; justify-content: space-between; @@ -73,7 +86,7 @@ padding-bottom: max(0.25rem, env(safe-area-inset-bottom, 0px)); } - .meet-toolbar__primary { + .meet-room-page .meet-toolbar__primary { display: flex; min-width: 0; flex: 1; @@ -81,14 +94,14 @@ gap: 0.5rem; } - .meet-toolbar__divider { + .meet-room-page .meet-toolbar__divider { width: 1px; height: 2rem; flex-shrink: 0; background-color: rgb(51 65 85); } - .meet-toolbar__actions { + .meet-room-page .meet-toolbar__actions { display: flex; flex-shrink: 0; align-items: center; @@ -97,7 +110,7 @@ } @media (min-width: 640px) { - .meet-toolbar__track { + .meet-room-page .meet-toolbar__track { display: flex; flex-wrap: wrap; align-items: center; @@ -107,7 +120,7 @@ } /* Meeting room chat / participants: bottom sheet on mobile, sidebar on desktop */ -.meet-room-panel { +.meet-room-page .meet-room-panel { position: fixed; inset: 0; z-index: 50; @@ -116,14 +129,14 @@ justify-content: flex-end; } -.meet-room-panel__backdrop { +.meet-room-page .meet-room-panel__backdrop { position: absolute; inset: 0; background-color: rgb(2 6 23 / 0.72); backdrop-filter: blur(4px); } -.meet-room-panel__sheet { +.meet-room-page .meet-room-panel__sheet { position: relative; z-index: 1; display: flex; @@ -135,13 +148,13 @@ padding: 0 0.75rem max(0.75rem, env(safe-area-inset-bottom, 0px)); } -.meet-room-panel__handle { +.meet-room-page .meet-room-panel__handle { display: flex; justify-content: center; padding: 0.75rem 0 0.25rem; } -.meet-room-panel__handle span { +.meet-room-page .meet-room-panel__handle span { display: block; height: 0.25rem; width: 2.5rem; @@ -149,7 +162,7 @@ background-color: rgb(51 65 85); } -.meet-room-panel__header { +.meet-room-page .meet-room-panel__header { display: flex; flex-shrink: 0; align-items: flex-start; @@ -158,7 +171,7 @@ padding: 0 0.25rem 0.75rem; } -.meet-room-panel__body { +.meet-room-page .meet-room-panel__body { display: flex; min-height: 0; flex: 1; @@ -170,7 +183,7 @@ } @media (min-width: 640px) { - .meet-room-panel { + .meet-room-page .meet-room-panel { position: relative; inset: auto; z-index: auto; @@ -181,12 +194,12 @@ justify-content: flex-start; } - .meet-room-panel__backdrop, - .meet-room-panel__handle { + .meet-room-page .meet-room-panel__backdrop, + .meet-room-page .meet-room-panel__handle { display: none; } - .meet-room-panel__sheet { + .meet-room-page .meet-room-panel__sheet { display: flex; height: 100%; max-height: none; @@ -196,7 +209,7 @@ padding: 0.75rem; } - .meet-room-panel__body { + .meet-room-page .meet-room-panel__body { border-radius: 1rem; } } diff --git a/resources/views/auth/signed-out.blade.php b/resources/views/auth/signed-out.blade.php index 35a188e..17c993c 100644 --- a/resources/views/auth/signed-out.blade.php +++ b/resources/views/auth/signed-out.blade.php @@ -4,7 +4,7 @@ $logoPath = public_path($logo); @endphp - + diff --git a/resources/views/auth/sso-error.blade.php b/resources/views/auth/sso-error.blade.php index 9d89915..be70ed2 100644 --- a/resources/views/auth/sso-error.blade.php +++ b/resources/views/auth/sso-error.blade.php @@ -5,7 +5,7 @@ $logoPath = public_path($logo); @endphp - + diff --git a/resources/views/auth/sso-logout-bridge.blade.php b/resources/views/auth/sso-logout-bridge.blade.php index 2540367..e6d8022 100644 --- a/resources/views/auth/sso-logout-bridge.blade.php +++ b/resources/views/auth/sso-logout-bridge.blade.php @@ -1,5 +1,5 @@ - + diff --git a/resources/views/components/app-layout.blade.php b/resources/views/components/app-layout.blade.php index de639dd..8b18427 100644 --- a/resources/views/components/app-layout.blade.php +++ b/resources/views/components/app-layout.blade.php @@ -1,6 +1,6 @@ @props(['title' => 'Ladill Meet', 'heading' => null]) - + diff --git a/resources/views/components/meet-kiosk-layout.blade.php b/resources/views/components/meet-kiosk-layout.blade.php index b476195..471d3e4 100644 --- a/resources/views/components/meet-kiosk-layout.blade.php +++ b/resources/views/components/meet-kiosk-layout.blade.php @@ -5,7 +5,7 @@ ]) - + diff --git a/resources/views/meet/dashboard.blade.php b/resources/views/meet/dashboard.blade.php index d69a0bb..ddf5ea0 100644 --- a/resources/views/meet/dashboard.blade.php +++ b/resources/views/meet/dashboard.blade.php @@ -101,7 +101,7 @@

Live meetings

@foreach ($active as $room) - @include('meet.partials.room-card', ['room' => $room, 'live' => true]) + @include('meet.partials.room-card', ['room' => $room]) @endforeach
diff --git a/resources/views/meet/invitations/rsvp-done.blade.php b/resources/views/meet/invitations/rsvp-done.blade.php index c23b69d..9414df2 100644 --- a/resources/views/meet/invitations/rsvp-done.blade.php +++ b/resources/views/meet/invitations/rsvp-done.blade.php @@ -1,5 +1,5 @@ - + diff --git a/resources/views/meet/invitations/rsvp.blade.php b/resources/views/meet/invitations/rsvp.blade.php index 853fe04..d647bd1 100644 --- a/resources/views/meet/invitations/rsvp.blade.php +++ b/resources/views/meet/invitations/rsvp.blade.php @@ -1,5 +1,5 @@ - + diff --git a/resources/views/meet/partials/room-card.blade.php b/resources/views/meet/partials/room-card.blade.php index 8ed05a7..48d9aec 100644 --- a/resources/views/meet/partials/room-card.blade.php +++ b/resources/views/meet/partials/room-card.blade.php @@ -6,7 +6,6 @@ 'cancelled' => 'bg-red-50 text-red-700', ]; $detailsRoute = $detailsRoute ?? route('meet.rooms.show', $room); - $startRoute = $startRoute ?? route('meet.rooms.start', $room); @endphp
@@ -27,17 +26,7 @@ @endif

-
- @if (($live ?? false) || $room->status === 'live') - @if ($room->activeSession()) - Join - @endif - @elseif ($room->canRestart()) -
- @csrf - -
- @endif +
Details
diff --git a/resources/views/meet/room/show.blade.php b/resources/views/meet/room/show.blade.php index 6b7be07..388156f 100644 --- a/resources/views/meet/room/show.blade.php +++ b/resources/views/meet/room/show.blade.php @@ -1,5 +1,5 @@ - + diff --git a/resources/views/meet/rooms/index.blade.php b/resources/views/meet/rooms/index.blade.php index 7732d02..c75d90f 100644 --- a/resources/views/meet/rooms/index.blade.php +++ b/resources/views/meet/rooms/index.blade.php @@ -6,7 +6,7 @@
@forelse ($rooms as $room) - @include('meet.partials.room-card', ['room' => $room, 'live' => $room->status === 'live']) + @include('meet.partials.room-card', ['room' => $room]) @empty

No meetings yet.

@endforelse diff --git a/resources/views/meet/rooms/show.blade.php b/resources/views/meet/rooms/show.blade.php index 862322d..f845321 100644 --- a/resources/views/meet/rooms/show.blade.php +++ b/resources/views/meet/rooms/show.blade.php @@ -5,17 +5,6 @@

{{ $room->title }}

{{ config('meet.room_statuses')[$room->status] ?? $room->status }}

- @if ($room->canRestart()) -
- @csrf - -
- @elseif ($room->status === 'scheduled') -
- @csrf - -
- @endif
@if ($errors->any()) @@ -32,18 +21,27 @@
+ @if ($room->status === 'live' && $room->activeSession()) + Join meeting + @elseif ($room->status === 'scheduled') +
+ @csrf + +
+ @elseif ($room->canRestart()) +
+ @csrf + +
+ @endif Download iCal QR code @if ($room->sessions->isNotEmpty()) Attendance CSV @endif Manage invitations - @if ($room->canRestart() && ($room->status === 'ended' || $room->type === 'personal' || $room->sessions->isNotEmpty())) -
- @csrf - -
- @endif
@if ($room->passcode) diff --git a/resources/views/meet/webinars/index.blade.php b/resources/views/meet/webinars/index.blade.php index 1742492..30dc2a8 100644 --- a/resources/views/meet/webinars/index.blade.php +++ b/resources/views/meet/webinars/index.blade.php @@ -11,9 +11,7 @@ @forelse ($webinars as $room) @include('meet.partials.room-card', [ 'room' => $room, - 'live' => $room->status === 'live', 'detailsRoute' => route('meet.webinars.show', $room), - 'startRoute' => route('meet.webinars.start', $room), ]) @empty

No webinars yet.

diff --git a/resources/views/partials/mobile-header-btn.blade.php b/resources/views/partials/mobile-header-btn.blade.php index 97d79c4..9f1c95c 100644 --- a/resources/views/partials/mobile-header-btn.blade.php +++ b/resources/views/partials/mobile-header-btn.blade.php @@ -9,7 +9,6 @@ $mobileClass = match ($variant) { 'primary' => 'btn-fab h-10 w-10 lg:hidden', 'outline' => 'inline-flex h-10 w-10 items-center justify-center rounded-full border border-slate-200 bg-white text-slate-700 shadow-sm transition hover:border-slate-300 hover:bg-slate-50 lg:hidden', - 'dark' => 'inline-flex h-10 w-10 items-center justify-center rounded-full bg-gray-900 text-white shadow-sm transition hover:bg-gray-800 lg:hidden', 'indigo' => 'inline-flex h-10 w-10 items-center justify-center rounded-full bg-indigo-600 text-white shadow-sm transition hover:bg-indigo-700 lg:hidden', default => 'btn-fab h-10 w-10 lg:hidden', }; @@ -17,7 +16,6 @@ $desktopClass = match ($variant) { 'primary' => 'btn-primary hidden items-center lg:inline-flex', 'outline' => 'hidden items-center rounded-lg border border-gray-200 bg-white px-4 py-2 text-sm font-medium text-gray-700 shadow-sm transition hover:bg-gray-50 lg:inline-flex', - 'dark' => 'hidden items-center gap-1.5 rounded-lg bg-gray-900 px-3.5 py-2 text-sm font-medium text-white transition hover:bg-gray-800 lg:inline-flex', 'indigo' => 'hidden items-center justify-center rounded-xl bg-indigo-600 px-4 py-2.5 text-sm font-semibold text-white transition hover:bg-indigo-700 lg:inline-flex', default => 'btn-primary hidden items-center lg:inline-flex', }; diff --git a/resources/views/partials/user-profile-menu.blade.php b/resources/views/partials/user-profile-menu.blade.php index 6ddfea8..b41ff97 100644 --- a/resources/views/partials/user-profile-menu.blade.php +++ b/resources/views/partials/user-profile-menu.blade.php @@ -8,30 +8,25 @@ @php $linkClass = match ($variant) { - 'dark' => 'block rounded-md px-3 py-2 text-sm text-slate-200 hover:bg-slate-800', 'sheet' => 'block rounded-xl px-4 py-3 text-sm font-medium text-slate-700 transition hover:bg-slate-100', default => 'block rounded-lg px-3 py-2 text-sm text-slate-700 hover:bg-slate-100', }; $logoutClass = match ($variant) { - 'dark' => 'w-full rounded-md px-3 py-2 text-left text-sm text-rose-300 hover:bg-rose-950/40', 'sheet' => 'w-full rounded-xl px-4 py-3 text-left text-sm font-medium text-rose-600 transition hover:bg-rose-50', default => 'w-full rounded-lg px-3 py-2 text-left text-sm text-rose-600 hover:bg-rose-50', }; $logoutWrapperClass = match ($variant) { 'sheet' => 'border-t border-slate-100 pt-2', - 'dark' => '', default => '', }; $dividerClass = match ($variant) { - 'dark' => 'my-1 border-t border-slate-800', default => 'my-1 border-t border-slate-100', }; $containerClass = match ($variant) { - 'dark' => 'mt-2 rounded-lg border border-slate-800 bg-slate-900 p-1', 'sheet' => 'space-y-1 p-2 pb-4', default => 'p-1', };