From 594e77ca41df62f4af4594df60f1c0068e60154c Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Sat, 14 Jul 2018 08:38:03 +0200 Subject: [PATCH] Only changed default width of datetimepicker for date-only inputs, as this does not work for side-by-side with time picker (references #14) --- public/css/grocy.css | 2 +- views/components/datetimepicker.blade.php | 4 ++-- views/inventory.blade.php | 3 ++- views/purchase.blade.php | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/public/css/grocy.css b/public/css/grocy.css index b5c7f865..0678d94f 100644 --- a/public/css/grocy.css +++ b/public/css/grocy.css @@ -158,6 +158,6 @@ td { } /* Third party component customizations - Tempus Dominus */ -.bootstrap-datetimepicker-widget.dropdown-menu { +.date-only-datetimepicker .bootstrap-datetimepicker-widget.dropdown-menu { width: auto !important; } diff --git a/views/components/datetimepicker.blade.php b/views/components/datetimepicker.blade.php index 5393791a..42db0019 100644 --- a/views/components/datetimepicker.blade.php +++ b/views/components/datetimepicker.blade.php @@ -3,8 +3,8 @@ @endpush
- -
+ +
false, 'limitStartToNow' => true, 'invalidFeedback' => $L('A best before date is required and must be later than today'), - 'nextInputSelector' => '#best_before_date' + 'nextInputSelector' => '#best_before_date', + 'additionalCssClasses' => 'date-only-datetimepicker' )) diff --git a/views/purchase.blade.php b/views/purchase.blade.php index 9d89a873..e28dc401 100644 --- a/views/purchase.blade.php +++ b/views/purchase.blade.php @@ -31,7 +31,8 @@ 'limitEndToNow' => false, 'limitStartToNow' => true, 'invalidFeedback' => $L('A best before date is required and must be later than today'), - 'nextInputSelector' => '#amount' + 'nextInputSelector' => '#amount', + 'additionalCssClasses' => 'date-only-datetimepicker' ))