diff --git a/app/Filament/Pages/General/ThemeSettings.php b/app/Filament/Pages/General/ThemeSettings.php index 756c539..e8eb930 100755 --- a/app/Filament/Pages/General/ThemeSettings.php +++ b/app/Filament/Pages/General/ThemeSettings.php @@ -500,8 +500,8 @@ final class ThemeSettings extends Page implements HasForms 'cyberpunk' => [ 'color_primary' => '#f0f', 'color_background' => '#0a0a0f', 'color_surface' => '#1a1a2e', 'color_dropdown' => '#1a1a2e', - 'color_navbar' => '#0a0a0f', 'color_navbar_text' => '#0ff', 'color_text' => '#b3e0e0', - 'color_text_muted' => '#f0f', 'color_accent' => '#ff0', + 'color_navbar' => '#0a0a0f', 'color_navbar_text' => '#0ff', 'color_text' => '#e0e0e0', + 'color_text_muted' => '#a855f7', 'color_accent' => '#ff0', 'input_text_color' => '#b3e0e0', 'input_placeholder_color' => '#806080', 'input_border_color' => '#ec4899', 'input_background' => '#1a1a2e', 'input_focus_color' => '#f0f', 'button_primary_color' => '#f0f', 'button_text_color' => '#000', @@ -599,7 +599,7 @@ final class ThemeSettings extends Page implements HasForms 'color_primary' => '#ff00ff', 'color_background' => '#0f0f23', 'color_surface' => '#1a1a3e', 'color_dropdown' => '#1a1a3e', 'color_navbar' => '#0f0f23', 'color_navbar_text' => '#00ffff', 'color_text' => '#e0b0e0', - 'color_text_muted' => '#9400d3', 'color_accent' => '#00ffff', + 'color_text_muted' => '#c084fc', 'color_accent' => '#00ffff', 'input_text_color' => '#e0b0e0', 'input_placeholder_color' => '#b366b3', 'input_border_color' => '#4c1d95', 'input_background' => '#1a1a3e', 'input_focus_color' => '#ff00ff', 'button_primary_color' => '#ff00ff', 'button_text_color' => '#000000', @@ -716,7 +716,7 @@ final class ThemeSettings extends Page implements HasForms 'color_primary' => '#ef4444', 'color_background' => '#1c1917', 'color_surface' => '#292524', 'color_dropdown' => '#44403c', 'color_navbar' => '#1c1917', 'color_navbar_text' => '#fca5a5', 'color_text' => '#fecaca', - 'color_text_muted' => '#b91c1c', 'color_accent' => '#f87171', + 'color_text_muted' => '#f87171', 'color_accent' => '#f87171', 'input_text_color' => '#fecaca', 'input_placeholder_color' => '#b91c1c', 'input_border_color' => '#57534e', 'input_background' => '#292524', 'button_primary_color' => '#ef4444', 'button_text_color' => '#ffffff', @@ -732,7 +732,7 @@ final class ThemeSettings extends Page implements HasForms 'color_primary' => '#16a34a', 'color_background' => '#052e16', 'color_surface' => '#14532d', 'color_dropdown' => '#166534', 'color_navbar' => '#052e16', 'color_navbar_text' => '#86efac', 'color_text' => '#bbf7d0', - 'color_text_muted' => '#15803d', 'color_accent' => '#4ade80', + 'color_text_muted' => '#4ade80', 'color_accent' => '#4ade80', 'input_text_color' => '#bbf7d0', 'input_placeholder_color' => '#15803d', 'input_border_color' => '#166534', 'input_background' => '#14532d', 'button_primary_color' => '#16a34a', 'button_text_color' => '#ffffff', @@ -764,7 +764,7 @@ final class ThemeSettings extends Page implements HasForms 'color_primary' => '#a855f7', 'color_background' => '#0f0518', 'color_surface' => '#1e0b33', 'color_dropdown' => '#2d1654', 'color_navbar' => '#0f0518', 'color_navbar_text' => '#e9d5ff', 'color_text' => '#f3e8ff', - 'color_text_muted' => '#9333ea', 'color_accent' => '#c084fc', + 'color_text_muted' => '#c084fc', 'color_accent' => '#c084fc', 'input_text_color' => '#f3e8ff', 'input_placeholder_color' => '#9333ea', 'input_border_color' => '#581c87', 'input_background' => '#1e0b33', 'button_primary_color' => '#a855f7', 'button_text_color' => '#ffffff', @@ -797,7 +797,7 @@ final class ThemeSettings extends Page implements HasForms 'color_primary' => '#71717a', 'color_background' => '#09090b', 'color_surface' => '#18181b', 'color_dropdown' => '#27272a', 'color_navbar' => '#000000', 'color_navbar_text' => '#a1a1aa', 'color_text' => '#d4d4d8', - 'color_text_muted' => '#52525b', 'color_accent' => '#a1a1aa', + 'color_text_muted' => '#a1a1aa', 'color_accent' => '#a1a1aa', 'input_text_color' => '#d4d4d8', 'input_placeholder_color' => '#52525b', 'input_border_color' => '#3f3f46', 'input_background' => '#18181b', 'button_primary_color' => '#52525b', 'button_text_color' => '#fafafa', diff --git a/resources/css/global.css b/resources/css/global.css index 704ac2a..ac6e555 100755 --- a/resources/css/global.css +++ b/resources/css/global.css @@ -19,12 +19,16 @@ @layer components { .nav-item { @apply flex h-auto md:h-[60px] items-center text-[14px] font-semibold uppercase transition duration-200 ease-in-out md:border-b-4! md:border-transparent! md:hover:border-b-[#eeb425]!; - @apply text-gray-700 dark:text-gray-100; + color: var(--color-navbar-text, #1e293b); } .dropdown-item { @apply block py-2 px-4 font-semibold transition duration-200; - @apply text-gray-900 dark:text-gray-100 hover:bg-gray-100 dark:hover:bg-gray-700; + color: var(--color-text); + } + .dropdown-item:hover { + background-color: var(--color-primary, #eeb425); + color: var(--button-text-color, #1a1a2e); } } @@ -60,6 +64,10 @@ html { scroll-behavior: smooth; } +body { + color: var(--color-text, #0f172a); +} + .drop-shadow { -webkit-filter: drop-shadow(2px 1px 0 #fff) drop-shadow(-2px 1px 0 #fff) drop-shadow(0 -2px 0 #fff); @@ -305,7 +313,7 @@ html.dark .swiper-pagination-bullet:not(.swiper-pagination-bullet-active) { } #article-content a { - color: #53b2f8; + color: var(--link-color, #53b2f8); } .cursor-grab { @@ -314,3 +322,13 @@ html.dark .swiper-pagination-bullet:not(.swiper-pagination-bullet-active) { .cursor-grab:active { cursor: grabbing !important; } + +/* Text utility classes using CSS variables */ +.text-body { color: var(--color-text); } +.text-muted { color: var(--color-text-muted); } +.text-nav { color: var(--color-navbar-text); } + +/* Text shadow for readability on images/dark backgrounds */ +.text-shadow { text-shadow: 0 1px 3px rgba(0,0,0,0.8); } +.text-shadow-sm { text-shadow: 0 1px 2px rgba(0,0,0,0.6); } +.text-shadow-lg { text-shadow: 0 2px 8px rgba(0,0,0,0.9); } diff --git a/resources/themes/atom/css/app.css b/resources/themes/atom/css/app.css index 6b59a9d..40b5152 100755 --- a/resources/themes/atom/css/app.css +++ b/resources/themes/atom/css/app.css @@ -400,3 +400,13 @@ html.dark .badge-drawer-button .toggled { background-color: #fff; opacity: 0.1; } + +/* Text utility classes using CSS variables */ +.text-body { color: var(--color-text); } +.text-muted { color: var(--color-text-muted); } +.text-nav { color: var(--color-navbar-text); } + +/* Text shadow for readability */ +.text-shadow { text-shadow: 0 1px 3px rgba(0,0,0,0.8); } +.text-shadow-sm { text-shadow: 0 1px 2px rgba(0,0,0,0.6); } +.text-shadow-lg { text-shadow: 0 2px 8px rgba(0,0,0,0.9); } diff --git a/resources/themes/atom/views/components/content/guest-content-card.blade.php b/resources/themes/atom/views/components/content/guest-content-card.blade.php index 2896ed1..b1a5834 100755 --- a/resources/themes/atom/views/components/content/guest-content-card.blade.php +++ b/resources/themes/atom/views/components/content/guest-content-card.blade.php @@ -7,10 +7,10 @@
-

{{ $title }}

+

{{ $title }}

@if(isset($underTitle)) -

{{ $underTitle }}

+

{{ $underTitle }}

@endif
diff --git a/resources/themes/atom/views/components/form/input.blade.php b/resources/themes/atom/views/components/form/input.blade.php index 047a3be..7037ced 100755 --- a/resources/themes/atom/views/components/form/input.blade.php +++ b/resources/themes/atom/views/components/form/input.blade.php @@ -11,7 +11,7 @@ onblur="this.style.borderColor='var(--input-border-color, var(--color-text-muted))'"> @error($name, $errorBag) -

+

{{ $message }}

@enderror diff --git a/resources/themes/atom/views/components/navigation/user-dropdown.blade.php b/resources/themes/atom/views/components/navigation/user-dropdown.blade.php index 61c0580..1634f61 100755 --- a/resources/themes/atom/views/components/navigation/user-dropdown.blade.php +++ b/resources/themes/atom/views/components/navigation/user-dropdown.blade.php @@ -25,9 +25,9 @@ @auth
@csrf - +
+ -

{{ __('Or') }}

+

{{ __('Or') }}

diff --git a/resources/themes/atom/views/components/top-header.blade.php b/resources/themes/atom/views/components/top-header.blade.php index 25ca1b4..44291c1 100755 --- a/resources/themes/atom/views/components/top-header.blade.php +++ b/resources/themes/atom/views/components/top-header.blade.php @@ -66,7 +66,7 @@ @csrf - diff --git a/resources/themes/atom/views/layouts/app.blade.php b/resources/themes/atom/views/layouts/app.blade.php index 292b90e..4033b65 100755 --- a/resources/themes/atom/views/layouts/app.blade.php +++ b/resources/themes/atom/views/layouts/app.blade.php @@ -105,9 +105,21 @@ /* Spinner */ --spinner-color: {{ setting('spinner_color', '#eeb425') }}; - /* Navbar */ - --navbar-height: {{ setting('navbar_height', '64') }}px; - } + /* Navbar */ + --navbar-height: {{ setting('navbar_height', '64') }}px; + } + + /* Text shadow for readability on the site background */ + .site-bg { + text-shadow: 0 1px 2px rgba(0,0,0,0.3); + } + .site-bg [class*="bg-"], + .site-bg [class*="rounded"], + .site-bg [style*="background"], + .site-bg .swiper-slide, + .site-bg img { + text-shadow: none; + } /* Button Effects */ @keyframes sparkle { diff --git a/resources/themes/dusk/css/app.css b/resources/themes/dusk/css/app.css index ccfb84b..29109b4 100755 --- a/resources/themes/dusk/css/app.css +++ b/resources/themes/dusk/css/app.css @@ -14,7 +14,12 @@ @layer components { .dropdown-item { - @apply w-full text-left px-2 py-1 transition duration-200 ease-in-out text-sm hover:bg-[#8770b2]; + @apply w-full text-left px-2 py-1 transition duration-200 ease-in-out text-sm; + color: var(--color-text); + } + .dropdown-item:hover { + background-color: var(--color-primary, #8770b2); + color: var(--button-text-color, #ffffff); } } @@ -25,8 +30,48 @@ body { overflow-x: hidden; + color: var(--color-text, #ffffff); } +/* Base text utility classes using CSS variables */ +.text-body { color: var(--color-text); } +.text-muted { color: var(--color-text-muted); } +.text-nav { color: var(--color-navbar-text); } +.text-primary { color: var(--color-primary); } +.text-on-primary { color: var(--button-text-color); } + +/* Settings navigation */ +.settings-nav:hover, +.settings-nav.active { + background-color: var(--color-primary) !important; + color: var(--button-text-color) !important; +} + +/* Dropdown panel */ +.dropdown-children { + background-color: var(--color-dropdown, #ac93da); + box-shadow: var(--dropdown-shadow, 0 4px 16px rgba(0,0,0,0.25)); +} + +/* Footer hover */ +.site-footer:hover { + color: var(--color-text) !important; +} + +/* Navigation link hover states using CSS variables */ +.nav-link { + color: var(--color-navbar-text); + transition: color 200ms ease-in-out; +} +.nav-link:hover { + color: var(--color-primary); +} + +/* Text shadow for readability on images/dark backgrounds */ +.text-shadow { text-shadow: 0 1px 3px rgba(0,0,0,0.8); } +.text-shadow-sm { text-shadow: 0 1px 2px rgba(0,0,0,0.6); } +.text-shadow-lg { text-shadow: 0 2px 8px rgba(0,0,0,0.9); } + #app { min-height: calc(100vh - 3.5rem); } @@ -40,6 +85,12 @@ img { pointer-events: none; } +input::placeholder, +textarea::placeholder { + color: var(--input-placeholder-color, var(--color-text-muted)); + opacity: 1; +} + .site-bg { position: absolute; width: 100%; @@ -62,7 +113,7 @@ img { } .nav-header { - background-color: #171a23; + background-color: var(--color-navbar, #171a23); width: 100%; display: flex; align-items: center; @@ -112,7 +163,7 @@ img { } .sub-header { - color: #FFF; + color: var(--color-text, #FFF); height: 40px; width: 100%; display: flex; @@ -138,8 +189,9 @@ img { } .read-more-link { - z-index: 99999; /* Adjust as needed */ + z-index: 99999; position: relative; + text-shadow: 0 1px 3px rgba(0,0,0,0.8); } .swiper-button-prev { diff --git a/resources/themes/dusk/views/components/article-card.blade.php b/resources/themes/dusk/views/components/article-card.blade.php index 8eabd49..57e948c 100755 --- a/resources/themes/dusk/views/components/article-card.blade.php +++ b/resources/themes/dusk/views/components/article-card.blade.php @@ -1,7 +1,7 @@ @props(['article'])
-
+

{{ $article->title }}

diff --git a/resources/themes/dusk/views/components/content/content-card.blade.php b/resources/themes/dusk/views/components/content/content-card.blade.php index c06a9ad..60c93ed 100755 --- a/resources/themes/dusk/views/components/content/content-card.blade.php +++ b/resources/themes/dusk/views/components/content/content-card.blade.php @@ -1,17 +1,17 @@ @props(['icon' => '', 'classes' => '']) -
+
@if (!empty($icon))
@endif
-

{{ $title }}

+

{{ $title }}

@if(isset($underTitle)) -

{{ $underTitle }}

+

{{ $underTitle }}

@endif
diff --git a/resources/themes/dusk/views/components/content/shop-card.blade.php b/resources/themes/dusk/views/components/content/shop-card.blade.php index 7f1ce10..b8e8073 100755 --- a/resources/themes/dusk/views/components/content/shop-card.blade.php +++ b/resources/themes/dusk/views/components/content/shop-card.blade.php @@ -1,17 +1,17 @@ @props(['iconUrl' => '', 'color' => '', 'classes' => '']) -
-
+
+
@if (!empty($iconUrl))
@endif
-
{{ $title }}
+
{{ $title }}
@if(isset($underTitle)) -

{{ $underTitle }}

+

{{ $underTitle }}

@endif
diff --git a/resources/themes/dusk/views/components/content/staff-content-section.blade.php b/resources/themes/dusk/views/components/content/staff-content-section.blade.php index 93f5762..b86eeed 100755 --- a/resources/themes/dusk/views/components/content/staff-content-section.blade.php +++ b/resources/themes/dusk/views/components/content/staff-content-section.blade.php @@ -1,6 +1,6 @@ @props(['badge' => '', 'color' => '#327fa8']) -
+
@@ -8,10 +8,10 @@
-

{{ $title }}

+

{{ $title }}

@if(isset($underTitle)) -

{{ $underTitle }}

+

{{ $underTitle }}

@endif
diff --git a/resources/themes/dusk/views/components/currency.blade.php b/resources/themes/dusk/views/components/currency.blade.php index 1aa27fd..3f43894 100755 --- a/resources/themes/dusk/views/components/currency.blade.php +++ b/resources/themes/dusk/views/components/currency.blade.php @@ -3,8 +3,8 @@
-
- +
+ {{ $currency }} diff --git a/resources/themes/dusk/views/components/filler-article-card.blade.php b/resources/themes/dusk/views/components/filler-article-card.blade.php index 6d50a59..62f3c02 100755 --- a/resources/themes/dusk/views/components/filler-article-card.blade.php +++ b/resources/themes/dusk/views/components/filler-article-card.blade.php @@ -1,19 +1,19 @@ -
+
-

+

{{ __('No published articles') }}

+ class="mt-3 flex h-10 w-10 items-center justify-center overflow-hidden rounded-full" style="background-color: var(--color-background);">
-

+

{{ setting('hotel_name') }}

diff --git a/resources/themes/dusk/views/components/footer.blade.php b/resources/themes/dusk/views/components/footer.blade.php index 4f51528..9e6e297 100755 --- a/resources/themes/dusk/views/components/footer.blade.php +++ b/resources/themes/dusk/views/components/footer.blade.php @@ -1,4 +1,4 @@ -