Skip to content

A free open source IT asset/license management system

Better preview for header color, updated text

snipe9a1e9f90bc85
diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php
index 901136e313..9f51fffb39 100644
--- a/resources/lang/en-US/admin/settings/general.php
+++ b/resources/lang/en-US/admin/settings/general.php
@@ -78,8 +78,8 @@ return [
'general_settings_help' => 'Default EULA and more',
'generate_backup' => 'Generate Backup',
'google_workspaces' => 'Google Workspaces',
- 'header_color' => 'Header Color',
- 'header_color_help' => 'Scroll up to the top of the screen to preview the header color.',
+ 'header_color' => 'Primary Theme Color',
+ 'header_color_help' => 'Selecting a new color here will let you preview the color with your logo selection (if you have a site logo uploaded) in the header, however it will not be saved until you click the Save button.',
'info' => 'These settings let you customize certain aspects of your installation.',
'label_logo_size' => 'Square logos look best - will be displayed in the top right of each asset label. ',
'laravel' => 'Laravel Version',
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 98c931fbff..30148e6536 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -54,6 +54,8 @@
--box-header-bottom-border: 1px solid var(--box-header-bottom-border-color);
--box-header-top-border-color: #d2d6de;
--box-header-top-border: 3px solid var(--box-header-top-border-color);
+ --callout-bg-color: var(--box-header-bottom-border-color);
+ --callout-left-border: var(--box-header-top-border-color);
--color-bg: #ecf0f5;
--color-fg: #000000;
--header-color: #000000;
@@ -78,6 +80,8 @@
--box-header-bottom-border: 1px solid var(--box-header-bottom-border-color);
--box-header-top-border-color: #605e5e;
--box-header-top-border: 3px solid var(--box-header-top-border-color);
+ --callout-bg-color: var(--box-header-top-border-color);
+ --callout-left-border: #323131;
--color-bg: #222222;
--color-fg: #ffffff;
--header-color: #ffffff;
@@ -558,6 +562,19 @@
box-shadow: inset 1em 1em var(--main-theme-color) !important;
}
+ .callout.callout-legend {
+ background-color: var(--callout-bg-color);
+ border-left: 5px solid var(--callout-left-border);
+
+ }
+
+ .callout.callout-legend h4 {
+ color: var(--color-fg);
+ }
+
+ legend {
+ border-bottom: 1px solid var(--callout-left-border);
+ }
</style>
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index 176c3723fa..1c7e9c677c 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -45,16 +45,16 @@
<x-icon type="branding"/>
{{ trans('admin/settings/general.brand') }}
</h2>
+
+ <button type="submit" class="btn btn-primary pull-right">
+ <x-icon type="checkmark" /> {{ trans('general.save') }}
+ </button>
+
</div>
<div class="box-body">
-
<div class="col-md-12">
- <fieldset name="logo-preferences">
- <x-form-legend>
- {{ trans('admin/settings/general.legends.logos') }}
- </x-form-legend>
<!-- Site name -->
<div class="form-group{{ $errors->has('site_name') ? ' error' : '' }}">
@@ -82,11 +82,15 @@
</div>
<p class="help-block">{{ trans('admin/settings/general.header_color_help') }}</p>
-
{!! $errors->first('header_color', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div>
</div>
+ <fieldset name="logo-preferences">
+ <x-form-legend>
+ {{ trans('admin/settings/general.legends.logos') }}
+ </x-form-legend>
+
@php
$optionTypes = trans('admin/settings/general.logo_option_types');
@endphp