diff --git a/src/assets/plugins/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js b/src/assets/plugins/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js index 5f0a98b..f45e7a0 100644 --- a/src/assets/plugins/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js +++ b/src/assets/plugins/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js @@ -1580,12 +1580,12 @@ d: j.getUTCDate(), D: a[q].daysShort[j.getUTCDay()], DD: a[q].days[j.getUTCDay()], - p: (a[q].meridiem.length == 2 ? a[q].meridiem[j.getUTCHours() < 12 ? 0 : 1] : ""), + p: ((a[q].meridiem && a[q].meridiem.length == 2) ? a[q].meridiem[j.getUTCHours() < 12 ? 0 : 1] : ""), h: j.getUTCHours(), i: j.getUTCMinutes(), s: j.getUTCSeconds() }; - if (a[q].meridiem.length == 2) { + if (a[q].meridiem && a[q].meridiem.length == 2) { p.H = (p.h % 12 == 0 ? 12 : p.h % 12) } else { p.H = p.h diff --git a/src/css/login.css b/src/css/login.css index 6a52c07..46dc62c 100644 --- a/src/css/login.css +++ b/src/css/login.css @@ -53,7 +53,6 @@ .login_box .form-control { display: inline-block; - *display: inline; zoom: 1; width: auto; font-size: 18px; @@ -112,7 +111,7 @@ height: 100%; z-index: -1; overflow: hidden; - background: linear-gradient(to bottom right, #00BFFF, #00FFFF); + background: linear-gradient(to bottom right, #7bbfea, #4e72b8); } #bubble-wrapper li {