Skip to content

Styles: Made non-active dark/light css variables exist by default #5923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 27, 2025
+31 −11
Merged

Styles: Made non-active dark/light css variables exist by default #5923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions resources/views/layouts/parts/custom-styles.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
@php
$settingSuffix = setting()->getForCurrentUser('dark-mode-enabled') ? '-dark' : '';
@endphp
<style>
:root {
--color-primary: {{ setting('app-color' . $settingSuffix) }};
--color-primary-light: {{ setting('app-color-light' . $settingSuffix) }};
--color-link: {{ setting('link-color' . $settingSuffix) }};
--color-bookshelf: {{ setting('bookshelf-color' . $settingSuffix)}};
--color-book: {{ setting('book-color' . $settingSuffix)}};
--color-chapter: {{ setting('chapter-color' . $settingSuffix)}};
--color-page: {{ setting('page-color' . $settingSuffix)}};
--color-page-draft: {{ setting('page-draft-color' . $settingSuffix)}};
--color-primary: {{ setting('app-color') }};
--color-primary-light: {{ setting('app-color-light') }};
--color-link: {{ setting('link-color') }};
--color-bookshelf: {{ setting('bookshelf-color') }};
--color-book: {{ setting('book-color') }};
--color-chapter: {{ setting('chapter-color') }};
--color-page: {{ setting('page-color') }};
--color-page-draft: {{ setting('page-draft-color') }};
}
:root.dark-mode {
--color-primary: {{ setting('app-color-dark') }};
--color-primary-light: {{ setting('app-color-light-dark') }};
--color-link: {{ setting('link-color-dark') }};
--color-bookshelf: {{ setting('bookshelf-color-dark') }};
--color-book: {{ setting('book-color-dark') }};
--color-chapter: {{ setting('chapter-color-dark') }};
--color-page: {{ setting('page-color-dark') }};
--color-page-draft: {{ setting('page-draft-color-dark') }};
}
</style>
13 changes: 13 additions & 0 deletions tests/Settings/SettingsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,17 @@ public function test_updating_and_removing_app_icon()
file_get_contents(public_path('favicon.ico')),
);
}

public function test_both_light_and_dark_colors_are_used_in_the_base_view()
{
// To allow for dynamic color changes on the front-end where desired.
$this->setSettings(['page-color' => 'superlightblue', 'page-color-dark' => 'superdarkblue']);

$resp = $this->get('/login');

$resp->assertSee(':root {');
$resp->assertSee('superlightblue');
$resp->assertSee(':root.dark-mode {');
$resp->assertSee('superdarkblue');
}
}