Merge pull request nkunihiko#16 from gcaprio/master

Upgrading datetimepicker to 3.0

Author: nkunihiko

README.md

@@ -90,6 +90,11 @@ Bootstrap3 and jQuery have to be included along with `{{ form.media }}`
 Release Notes
 -------------------------------
 
+###### v2.3
+
+* Updated bootstrap-datetimepicker.js to version 3.0
+
+
 ###### v2.2.3
 
 * Updated bootstrap-datetimepicker.js to version 2.1.30

README.rst

@@ -98,6 +98,15 @@ Bootstrap3 and jQuery have to be included along with
 Release Notes
 -------------
 
+v2.3
+
+- Updated bootstrap-datetimepicker.js to version 3.0
+
+v2.2.3
+
+- Updated bootstrap-datetimepicker.js to version 2.1.30
+
+
 v2.2.3
 
 - Updated bootstrap-datetimepicker.js to version 2.1.30

bootstrap3_datetime/static/bootstrap3_datetime/css/bootstrap-datetimepicker.css

@@ -1,30 +1,20 @@
-/**
- * Build file for the dist version of datetimepicker.css
- */
 /*!
  * Datetimepicker for Bootstrap v3
  * https://github.com/Eonasdan/bootstrap-datetimepicker/
- * Copyright 2012 Stefan Petre
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
  */
 .bootstrap-datetimepicker-widget {
   top: 0;
   left: 0;
   width: 250px;
   padding: 4px;
   margin-top: 1px;
-  z-index: 99999;
+  z-index: 99999 !important;
   border-radius: 4px;
-  /*.dow {
-  border-top: 1px solid #ddd !important;
-  }*/
 }
-.bootstrap-datetimepicker-widget .btn {
-  padding: 6px;
+.bootstrap-datetimepicker-widget.timepicker-sbs {
+  width: 600px;
 }
-.bootstrap-datetimepicker-widget:before {
+.bootstrap-datetimepicker-widget.bottom:before {
   content: '';
   display: inline-block;
   border-left: 7px solid transparent;
@@ -33,18 +23,42 @@
   border-bottom-color: rgba(0, 0, 0, 0.2);
   position: absolute;
   top: -7px;
-  left: 6px;
+  left: 7px;
 }
-.bootstrap-datetimepicker-widget:after {
+.bootstrap-datetimepicker-widget.bottom:after {
   content: '';
   display: inline-block;
   border-left: 6px solid transparent;
   border-right: 6px solid transparent;
   border-bottom: 6px solid white;
   position: absolute;
   top: -6px;
+  left: 8px;
+}
+.bootstrap-datetimepicker-widget.top:before {
+  content: '';
+  display: inline-block;
+  border-left: 7px solid transparent;
+  border-right: 7px solid transparent;
+  border-top: 7px solid #ccc;
+  border-top-color: rgba(0, 0, 0, 0.2);
+  position: absolute;
+  bottom: -7px;
+  left: 6px;
+}
+.bootstrap-datetimepicker-widget.top:after {
+  content: '';
+  display: inline-block;
+  border-left: 6px solid transparent;
+  border-right: 6px solid transparent;
+  border-top: 6px solid white;
+  position: absolute;
+  bottom: -6px;
   left: 7px;
 }
+.bootstrap-datetimepicker-widget .dow {
+  width: 14.2857%;
+}
 .bootstrap-datetimepicker-widget.pull-right:before {
   left: auto;
   right: 6px;
@@ -97,12 +111,28 @@
 .bootstrap-datetimepicker-widget td.new {
   color: #999999;
 }
+.bootstrap-datetimepicker-widget td.today {
+  position: relative;
+}
+.bootstrap-datetimepicker-widget td.today:before {
+  content: '';
+  display: inline-block;
+  border-left: 7px solid transparent;
+  border-bottom: 7px solid #428bca;
+  border-top-color: rgba(0, 0, 0, 0.2);
+  position: absolute;
+  bottom: 4px;
+  right: 4px;
+}
 .bootstrap-datetimepicker-widget td.active,
 .bootstrap-datetimepicker-widget td.active:hover {
   background-color: #428bca;
   color: #fff;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
 }
+.bootstrap-datetimepicker-widget td.active.today:before {
+  border-bottom-color: #fff;
+}
 .bootstrap-datetimepicker-widget td.disabled,
 .bootstrap-datetimepicker-widget td.disabled:hover {
   background: none;
@@ -169,6 +199,6 @@
   left: auto;
   right: 7px;
 }
-.bootstrap-datetimepicker-widget ul.list-unstyled li.in div.timepicker div.timepicker-picker table.table-condensed tbody > tr > td {
+.bootstrap-datetimepicker-widget ul.list-unstyled li div.timepicker div.timepicker-picker table.table-condensed tbody > tr > td {
   padding: 0px !important;
 }