浏览代码

added seconds in air-datepicker (#2537)

version-14
Faris Ansari 8 年前
committed by Rushabh Mehta
父节点
当前提交
f31f830747
共有 5 个文件被更改,包括 7 次插入6 次删除
  1. +2
    -1
      frappe/public/css/desk.css
  2. +1
    -1
      frappe/public/js/frappe/form/control.js
  3. +1
    -1
      frappe/public/js/lib/datepicker/datepicker.min.css
  4. +2
    -2
      frappe/public/js/lib/datepicker/datepicker.min.js
  5. +1
    -1
      frappe/public/less/desk.less

+ 2
- 1
frappe/public/css/desk.css 查看文件

@@ -353,7 +353,8 @@ fieldset[disabled] .form-control {
z-index: 9999 !important;
}
.datepicker--time-current-hours,
.datepicker--time-current-minutes {
.datepicker--time-current-minutes,
.datepicker--time-current-seconds {
font-family: inherit;
}
.datepicker--day-name {


+ 1
- 1
frappe/public/js/frappe/form/control.js 查看文件

@@ -675,7 +675,7 @@ frappe.ui.form.ControlDatetime = frappe.ui.form.ControlDate.extend({
set_date_options: function() {
this._super();
this.datepicker_options.timepicker = true;
this.datepicker_options.timeFormat = "hh:ii";
this.datepicker_options.timeFormat = "hh:ii:ss";
},
parse: function(value) {
if(value) {


+ 1
- 1
frappe/public/js/lib/datepicker/datepicker.min.css
文件差异内容过多而无法显示
查看文件


+ 2
- 2
frappe/public/js/lib/datepicker/datepicker.min.js
文件差异内容过多而无法显示
查看文件


+ 1
- 1
frappe/public/less/desk.less 查看文件

@@ -142,7 +142,7 @@ textarea.form-control {
font-family: inherit;
z-index: 9999 !important;

&--time-current-hours, &--time-current-minutes {
&--time-current-hours, &--time-current-minutes, &--time-current-seconds {
font-family: inherit;
}



正在加载...
取消
保存