diff --git a/database/migrations/2025_11_28_175733_add_link_colors_to_settings.php b/database/migrations/2025_11_28_175733_add_link_colors_to_settings.php index dcdfadcf1f..52fed67a5a 100644 --- a/database/migrations/2025_11_28_175733_add_link_colors_to_settings.php +++ b/database/migrations/2025_11_28_175733_add_link_colors_to_settings.php @@ -97,11 +97,7 @@ return new class extends Migration 'link_dark_color' => $link_dark_color, 'nav_link_color' => $nav_color, 'header_color' => $header_color]); - - DB::table('users')->whereNull('skin')->update([ - 'link_light_color' => $link_light_color, - 'link_dark_color' => $link_dark_color, - 'nav_link_color' => $nav_color]); + } } diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php index ea8a93c9d6..a0673ffa0a 100644 --- a/resources/lang/en-US/admin/settings/general.php +++ b/resources/lang/en-US/admin/settings/general.php @@ -41,6 +41,9 @@ return [ 'backups_logged_out' => 'All existing users, including you, will be logged out once your restore is complete.', 'backups_large' => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ', 'barcode_settings' => 'Barcode Settings', + 'color_preferences' => 'Color & Theme Settings', + 'color_settings_help' => 'These settings will be used throughout Snipe-IT. Users are able to override the link colors by editing their account preferences to meet their individual readability requirements.', + 'color_reset' => 'Reset to Default', 'confirm_purge' => 'Confirm Purge', 'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)', 'custom_css' => 'Custom CSS', diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php index 10527c8a85..37ac6eba5e 100644 --- a/resources/lang/en-US/general.php +++ b/resources/lang/en-US/general.php @@ -540,7 +540,8 @@ return [ 'light_mode' => 'Light Mode', 'dark_mode' => 'Dark Mode', 'light_dark' => 'Light/Dark Mode', - 'system_default' => 'Use System Default', + 'system_default' => 'Use System Settings', + 'system_default_help' => 'This will reset your light/dark mode preferences to use the defaults set in your computer operating system preferences.', 'theme' => 'Theme', 'error_user_company' => 'Checkout target company and asset company do not match', 'error_user_company_multiple' => 'One or more of the checkout target company and asset company do not match', diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php index ac1606068b..20ed9e1d79 100755 --- a/resources/views/account/profile.blade.php +++ b/resources/views/account/profile.blade.php @@ -71,10 +71,15 @@

- + {{ trans('general.system_default') }}

+ +

+ {{ trans('general.system_default_help') }} +

+

@@ -82,7 +87,7 @@
@@ -91,7 +96,7 @@
@@ -264,6 +269,47 @@ localStorage.removeItem("theme"); }); + $('#enable_sounds').on("click",function () { + if ($('#enable_sounds').is(":checked")) { + var audio = new Audio('{{ config('app.url') }}/sounds/success.mp3'); + audio.play(); + } + + }); + + $('#enable_confetti').on("click",function () { + if ($('#enable_confetti').is(":checked")) { + var duration = 1500; + var animationEnd = Date.now() + duration; + var defaults = {startVelocity: 30, spread: 360, ticks: 60, zIndex: 0}; + + function randomInRange(min, max) { + return Math.random() * (max - min) + min; + } + + var interval = setInterval(function () { + var timeLeft = animationEnd - Date.now(); + + if (timeLeft <= 0) { + return clearInterval(interval); + } + + var particleCount = 50 * (timeLeft / duration); + // since particles fall down, start a bit higher than random + confetti({ + ...defaults, + particleCount, + origin: {x: randomInRange(0.1, 0.3), y: Math.random() - 0.2} + }); + confetti({ + ...defaults, + particleCount, + origin: {x: randomInRange(0.7, 0.9), y: Math.random() - 0.2} + }); + }, 250); + } + }); + $('#nav-link-color').colorpicker().on('changeColor', function(e) { diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index 92ca33f545..489ec1f940 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -50,9 +50,9 @@ --main-footer-bg-color: light-dark(#ffffff,#3d4144); --main-footer-text-color: light-dark(#605e5e, #d2d6de); --main-footer-top-border-color: light-dark(#d2d6de,#605e5e); - --main-theme-color: {{ $snipeSettings->header_color ?? '#5fa4cc' }}; - --nav-hover-text-color: {{ $nav_link_color ?? 'light-dark(hsl(from var(--main-theme-color) h s calc(l - 10)),hsl(from var(--main-theme-color) h s calc(l - 10)))' }}; - --nav-primary-text-color: {{ $nav_link_color ?? 'light-dark(hsl(from var(--main-theme-color) h s calc(l - 10)),hsl(from var(--main-theme-color) h s calc(l - 10)))' }}; + --main-theme-color: {{ $snipeSettings->header_color ?? '#3c8dbc' }}; + --nav-hover-text-color: {{ $nav_link_color ?? 'hsl(from var(--main-theme-color) h s calc(l - 10))' }}; + --nav-primary-text-color: {{ $nav_link_color ?? '#ffffff' }}; --search-highlight: #e9d15b; --sidenav-hover-color-bg: #4c4b4b; --sidenav-text-hover-color: #fff; @@ -63,7 +63,7 @@ --table-stripe-bg-alt: light-dark(rgba(211, 211, 211, 0.25), #323131); --table-stripe-bg: light-dark(#ffffff, #494747); --text-danger: light-dark(#a94442, #fa5b48); - --text-help: light-dark(#605e5e,#a6a4a4); + --text-help: light-dark(#777676,#a6a4a4); --text-info: light-dark(#31708f,#2baae6); --text-success: light-dark(#039516,#4ced61); --text-warning: light-dark(#da9113,#f3a51f); @@ -672,7 +672,7 @@ .help-block { - color: var(--text-help); + color: var(--text-help) !important; } .alert-msg, diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php index 1a3e0d3371..9d7d1f4ea8 100644 --- a/resources/views/settings/branding.blade.php +++ b/resources/views/settings/branding.blade.php @@ -72,6 +72,11 @@
+
+ + {{ trans('admin/settings/general.color_preferences') }} + +
@@ -86,7 +91,7 @@
- + {!! $errors->first('nav_link_color', '') !!}

{{ trans('admin/settings/general.nav_link_color_help') }}

@@ -112,6 +117,17 @@
+
+
+

+ + {{ trans('admin/settings/general.color_reset') }} + +

+
+
+
+
{{ trans('admin/settings/general.legends.logos') }} @@ -269,7 +285,7 @@
-
+
{{ trans('admin/settings/general.custom_css') }} @@ -439,6 +455,7 @@ // This takes the color from the color picker to show a live preview $(function() { + $('#header-color').colorpicker().on('changeColor', function(e) { var color = e.color.toString('rgba'); $('.main-header .navbar, .header-preview, .left-navblock, .navbar-custom-menu > .navbar-nav, .navbar-custom-menu > .navbar-nav > li > .navbar-form, .navbar-nav > li > a:link, .navbar-nav > li > a').css('background-color', color); @@ -448,16 +465,37 @@ $('#nav-link-color').colorpicker().on('changeColor', function(e) { var color = e.color.toString('rgba'); var header_color = $('#header_color').val(); - console.log(header_color); // $('.navbar-nav > li > a').css('background-color', header_color); $('.navbar-nav > li > a:link').attr('style','color: '+ color +' !important').css('background-color', header_color); $('.btn-theme').attr('style','color: '+ color +' !important').css('background-color', header_color); - - - }); + + /** + * 5. Add an event listener to toggle the reset + */ + clearButton.addEventListener("click", (event) => { + + var header_color = '#3c8dbc'; + var nav_link_color = '#ffffff'; + var link_light_color = '#296282'; + var link_dark_color = '#5fa4cc'; + + $('#header_color').val(header_color); + $('#nav_link_color').val(nav_link_color); + $('#link_light_color').val(link_light_color); + $('#link_dark_color').val(link_dark_color); + + $('.main-header .navbar, .header-preview, .left-navblock, .navbar-custom-menu > .navbar-nav, .navbar-custom-menu > .navbar-nav > li > .navbar-form, .navbar-nav > li > a:link, .navbar-nav > li > a').css('background-color', header_color); + $('.btn-theme').css('background-color', header_color); + + $('.navbar-nav > li > a:link').attr('style','color: '+ nav_link_color +' !important').css('background-color', header_color); + $('.btn-theme').attr('style','color: '+ nav_link_color +' !important').css('background-color', header_color); + + return false; + }); + });