A free open source IT asset/license management system
Datepicker color fixes
snipe662cdbaa0e15
diff --git a/resources/views/blade/input/datepicker.blade.php b/resources/views/blade/input/datepicker.blade.phpindex 111aa8dbf7..0fe10c9334 100644--- a/resources/views/blade/input/datepicker.blade.php+++ b/resources/views/blade/input/datepicker.blade.php@@ -6,7 +6,8 @@])<!-- Datepicker -->-<div class="input-group date {{ $col_size_class }}" data-provide="datepicker" data-date-today-highlight="true" data-date-language="{{ auth()->user()->locale }}" data-date-locale="{{ auth()->user()->locale }}" data-date-format="yyyy-mm-dd" data-date-autoclose="true" data-date-clear-btn="true"{{ $end_date ? ' data-date-end-date=' . $end_date : '' }}>+<div class="input-group date {{ $col_size_class }}"+ data-provide="datepicker" data-date-today-highlight="true" data-date-language="{{ auth()->user()->locale }}" data-date-locale="{{ auth()->user()->locale }}" data-date-format="yyyy-mm-dd" data-date-autoclose="true" data-date-clear-btn="true" data-date-today-btn="true" {{ $end_date ? ' data-date-end-date=' . $end_date : '' }}><input type="text" placeholder="{{ trans('general.select_date') }}" value="{{ $value }}" maxlength="10" {{ $attributes->merge(['class' => 'form-control']) }} {{ $required=='1' ? 'required' : '' }}><span class="input-group-addon"><x-icon type="calendar" /></span>diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.phpindex 98914bdff1..c577543d56 100644--- a/resources/views/layouts/default.blade.php+++ b/resources/views/layouts/default.blade.php@@ -50,7 +50,7 @@--sidenav-text-hover-color: #fff;--sidenav-text-nohover-color: #b8c7ce;--search-highlight: #e9d15b;- --color-fg: light-dark(#000000, #ffffff);+ --color-fg: light-dark(#373636, #ffffff);--text-danger: light-dark(#a94442,#dd4b39);--text-success: light-dark(#039516,#4ced61);--text-warning: light-dark(#da9113,#f3a51f);@@ -59,6 +59,7 @@--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)))' }};--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)))' }};+}[data-theme="light"] {@@ -86,6 +87,8 @@--text-blue: var(--text-legend-help);--text-legend-help: var(--text-help);--text-warning: #da9113;+ --input-group-bg: hsl(from var(--box-bg) h s calc(l - 5));+ --input-group-fg: hsl(from var(--input-group-bg) h s calc(l - 50));}@@ -113,6 +116,9 @@--table-stripe-bg: #494747;--text-blue: var(--text-legend-help);--text-legend-help: #d6d6d6;+ --input-group-bg: hsl(from var(--box-bg) h s calc(l + 10));+ --input-group-fg: hsl(from var(--input-group-bg) h s calc(l + 50));+}@@ -158,7 +164,7 @@}.dropdown-wrapper,- .input-group-addon,+.js-data-ajax,.option,.select2 .select2-container .select2-container--default,@@ -189,6 +195,11 @@}+ .input-group-addon {+ background-color: var(--input-group-bg) !important;+ color: var(--input-group-fg) !important;+ }+.select2-container--default.select2-container--focus .select2-selection--multiple,.select2-container--default .select2-search--dropdown .select2-search__field {border-color: hsl(from var(--main-theme-color) h s calc(l - 5)) !important;@@ -289,6 +300,28 @@color: var(--color-fg);}+ .datepicker.dropdown-menu th, .datepicker.datepicker-inline th,+ .datepicker.dropdown-menu td,+ .datepicker.datepicker-inline td++ {+ color: var(--color-fg);+ border-color: var(--color-fg);+ background-color: var(--box-bg) !important;+ }++ .datepicker.dropdown-menu th:hover,+ .datepicker.datepicker-inline th:hover,+ .datepicker.dropdown-menu td:hover,+ .datepicker.datepicker-inline td:hover,+ .datepicker table tr td span:hover,+ .datepicker table tr td span.focused+ {+ background-color: var(--main-theme-color) !important;+ color: var(--nav-primary-text-color) !important;+ }++ .datepicker.dropdown-menu,.modal-content,.popover.help-popover,.popover.help-popover .popover-content,@@ -299,9 +332,9 @@background-color: var(--box-bg) !important;/*color: var(--color-fg) !important;*/color: contrast-color(var(--box-bg)) !important;-}+.popover.right .arrow:after{border-right-color: var(--box-bg) !important;diff --git a/resources/views/licenses/edit.blade.php b/resources/views/licenses/edit.blade.phpindex 1f0e7accb4..982a444851 100755--- a/resources/views/licenses/edit.blade.php+++ b/resources/views/licenses/edit.blade.php@@ -86,7 +86,7 @@<label for="expiration_date" class="col-md-3 control-label">{{ trans('admin/licenses/form.expiration') }}</label><div class="input-group col-md-4">- <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true" data-date-clear-btn="true">+ <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-today-btn="true" data-date-today-highlight="true" data-autoclose="true" data-date-clear-btn="true"><input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expiration_date" id="expiration_date" value="{{ old('expiration_date', ($item->expiration_date) ? $item->expiration_date->format('Y-m-d') : '') }}" maxlength="10"><span class="input-group-addon"><x-icon type="calendar" /></span></div>@@ -100,7 +100,7 @@<label for="termination_date" class="col-md-3 control-label">{{ trans('admin/licenses/form.termination_date') }}</label><div class="input-group col-md-4">- <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true" data-date-clear-btn="true">+ <div class="input-group date" data-provide="datepicker" data-date-today-btn="true" data-date-today-highlight="true" data-date-format="yyyy-mm-dd" data-autoclose="true" data-date-clear-btn="true"><input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="termination_date" id="termination_date" value="{{ old('termination_date', ($item->termination_date) ? $item->termination_date->format('Y-m-d') : '') }}" maxlength="10"><span class="input-group-addon"><x-icon type="calendar" /></span></div>