From 2c50a49ef6a69b1bef5b251bfded7cf95f5e22ea Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Fri, 20 Jun 2014 10:34:27 +0100 Subject: [PATCH] further tweaks to prevent scrolling of date inputs --- wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js | 4 ++++ .../static/wagtailadmin/scss/layouts/page-editor.scss | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js index 32c2fa10e..fe60f1dd4 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js +++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js @@ -60,6 +60,7 @@ function initDateChooser(id) { if (window.dateTimePickerTranslations) { $('#' + id).datetimepicker({ timepicker: false, + scrollInput:false, format: 'Y-m-d', i18n: { lang: window.dateTimePickerTranslations @@ -69,6 +70,7 @@ function initDateChooser(id) { } else { $('#' + id).datetimepicker({ timepicker: false, + scrollInput:false, format: 'Y-m-d', }); } @@ -78,6 +80,7 @@ function initTimeChooser(id) { if (window.dateTimePickerTranslations) { $('#' + id).datetimepicker({ datepicker: false, + scrollInput:false, format: 'H:i', i18n: { lang: window.dateTimePickerTranslations @@ -96,6 +99,7 @@ function initDateTimeChooser(id) { if (window.dateTimePickerTranslations) { $('#' + id).datetimepicker({ format: 'Y-m-d H:i', + scrollInput:false, i18n: { lang: window.dateTimePickerTranslations }, diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss index c75f0b6bc..ae9fb5078 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss @@ -25,6 +25,12 @@ } } +.page-editor .xdsoft_datetimepicker{ + border-top:0; + margin-top:-1px; + margin-left:3px; +} + .object{ position:relative; overflow:hidden;