timmybee/travel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'Fix Bootstrap light/dark theming' (#6) from feature/bootstrap-theming into master
All checks were successful
linter / quality (push) Successful in 1m15s
Details
security / Dependency Audit (push) Successful in 1m29s
Details
security / Static Analysis (push) Successful in 1m25s
Details
tests / ci (8.4) (push) Successful in 1m58s
Details
tests / ci (8.5) (push) Successful in 1m28s
Details

Browse Source 
Reviewed-on: #6
This commit was merged in pull request #6.
This commit is contained in:
timmybee
2026-03-06 10:17:48 +08:00
parent 5f0b4218ae 236ba9558c
commit 98abc637c8
5 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources/js/app.js
View File

@@ -1,4 +1,3 @@
import * as bootstrap from 'bootstrap';
import './../../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js';
window.bootstrap = bootstrap;

20
resources/views/components/layouts/app.blade.php
View File

@@ -1,8 +1,9 @@
<!doctype html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}" x-data x-init="
const saved = localStorage.getItem('theme');
if (saved) { document.documentElement.setAttribute('data-bs-theme', saved); }
">
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}"
x-data="{ theme: localStorage.getItem('theme') || 'light' }"
x-init="$watch('theme', val => { document.documentElement.setAttribute('data-bs-theme', val); localStorage.setItem('theme', val); }); document.documentElement.setAttribute('data-bs-theme', theme);"
:data-bs-theme="theme"
>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -43,16 +44,11 @@
<li class="nav-item me-2">
<button
class="btn btn-sm btn-outline-light"
x-on:click="
const current = document.documentElement.getAttribute('data-bs-theme');
const next = current === 'dark' ? 'light' : 'dark';
document.documentElement.setAttribute('data-bs-theme', next);
localStorage.setItem('theme', next);
"
x-on:click="theme = theme === 'dark' ? 'light' : 'dark'"
title="Toggle dark/light mode"
>
<span x-show="document.documentElement.getAttribute('data-bs-theme') !== 'dark'">🌙</span>
<span x-show="document.documentElement.getAttribute('data-bs-theme') === 'dark'">☀️</span>
<span x-show="theme !== 'dark'">🌙</span>
<span x-show="theme === 'dark'">☀️</span>
</button>
</li>
@auth

8
resources/views/components/layouts/guest.blade.php
View File

@@ -1,5 +1,9 @@
<!doctype html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}"
x-data="{ theme: localStorage.getItem('theme') || 'light' }"
x-init="document.documentElement.setAttribute('data-bs-theme', theme);"
:data-bs-theme="theme"
>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -8,7 +12,7 @@
@vite(['resources/css/app.css', 'resources/js/app.js'])
@livewireStyles
</head>
<body class="bg-light">
<body>
{{ $slot }}
@livewireScripts
</body>

2
resources/views/livewire/auth/login.blade.php
View File

@@ -29,7 +29,7 @@ new #[Layout('components.layouts.guest')] class extends Component {
}
?>
<div class="min-vh-100 d-flex align-items-center justify-content-center bg-light">
<div class="min-vh-100 d-flex align-items-center justify-content-center">
<div class="card shadow-sm" style="width: 100%; max-width: 420px;">
<div class="card-body p-4">
<div class="text-center mb-4">

4
resources/views/livewire/travel-request/create.blade.php
View File

@@ -318,7 +318,7 @@ new #[Layout('components.layouts.app')] class extends Component {
@error('journeys') <div class="alert alert-danger">{{ $message }}</div> @enderror
@foreach ($journeys as $i => $journey)
<div class="border rounded p-3 mb-3 bg-light" wire:key="journey-{{ $i }}">
<div class="border rounded p-3 mb-3" wire:key="journey-{{ $i }}">
<div class="d-flex justify-content-between align-items-center mb-2">
<strong class="small">Journey {{ $i + 1 }}</strong>
@if (count($journeys) > 1)
@@ -413,7 +413,7 @@ new #[Layout('components.layouts.app')] class extends Component {
</div>
<div class="card-body">
@foreach ($costCodes as $i => $code)
<div class="border rounded p-3 mb-3 bg-light" wire:key="code-{{ $i }}">
<div class="border rounded p-3 mb-3" wire:key="code-{{ $i }}">
<div class="d-flex justify-content-between align-items-center mb-2">
<strong class="small">Cost Code {{ $i + 1 }}</strong>
@if (count($costCodes) > 1)