Permalink
Browse files

BUG TimeField respects user choice (fixes #8260)

Regression from c969e04.
Also fixes width to accommodate for widest common format:
"11:11:11 AM"
  • Loading branch information...
1 parent b25b6d4 commit e21bd494621e3092edd893e3083ad5c8b16603f3 @chillu chillu committed Feb 17, 2013
Showing with 15 additions and 15 deletions.
  1. +13 −13 admin/css/screen.css
  2. +1 −1 admin/scss/_forms.scss
  3. +1 −1 forms/TimeField.php
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -250,7 +250,7 @@ form.small .field, .field.small {
}
input.time {
- width: ($grid-x * 8); // smaller time field, since input is restricted
+ width: ($grid-x * 11); // smaller time field, since input is restricted
}
/* Hides borders in settings/access. Activated from JS */
View
@@ -27,7 +27,7 @@ class TimeField extends TextField {
* @var array
*/
static $default_config = array(
- 'timeformat' => 'HH:mm:ss',
+ 'timeformat' => null,
'use_strtotime' => true,
'datavalueformat' => 'HH:mm:ss'
);

0 comments on commit e21bd49

Please sign in to comment.