Skip to content

Commit

Permalink
Updated bootstrap-datetimepicker.js to version 2.1.30
Browse files Browse the repository at this point in the history
  • Loading branch information
nkunihiko committed Jan 29, 2014
1 parent 737bec7 commit 8aa28a6
Show file tree
Hide file tree
Showing 67 changed files with 256 additions and 134 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ Bootstrap3 and jQuery have to be included along with `{{ form.media }}`
Release Notes
-------------------------------

###### v2.2.3

* Updated bootstrap-datetimepicker.js to version 2.1.30


###### v2.0.0

* Includes bootstrap-datetimepicker.js version 2.1.11 with moment.js
Expand Down
4 changes: 4 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ Bootstrap3 and jQuery have to be included along with
Release Notes
-------------

v2.2.3

- Updated bootstrap-datetimepicker.js to version 2.1.30

v2.0.0

- Includes bootstrap-datetimepicker.js version 2.1.11 with moment.js
Expand Down
99 changes: 39 additions & 60 deletions bootstrap3_datetime/static/bootstrap3_datetime/css/bootstrap-datetimepicker.css
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,195 +1,174 @@
/**
* Build file for the dist version of datetimepicker.css
*/
/*!
* Datepicker for Bootstrap v3
*
* 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;
z-index: 3000;
width: 250px;
padding: 4px;
margin-top: 1px;
z-index: 99999;
border-radius: 4px;
/*.dow {
border-top: 1px solid #ddd !important;
}*/
}
.bootstrap-datetimepicker-widget .btn {
padding: 6px;
}

.bootstrap-datetimepicker-widget:before {
position: absolute;
top: -7px;
left: 6px;
content: '';
display: inline-block;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-bottom: 7px solid #ccc;
border-left: 7px solid transparent;
border-bottom-color: rgba(0, 0, 0, 0.2);
content: '';
position: absolute;
top: -7px;
left: 6px;
}

.bootstrap-datetimepicker-widget:after {
position: absolute;
top: -6px;
left: 7px;
content: '';
display: inline-block;
border-left: 6px solid transparent;
border-right: 6px solid transparent;
border-bottom: 6px solid white;
border-left: 6px solid transparent;
content: '';
position: absolute;
top: -6px;
left: 7px;
}

.bootstrap-datetimepicker-widget.pull-right:before {
right: 6px;
left: auto;
right: 6px;
}

.bootstrap-datetimepicker-widget.pull-right:after {
right: 7px;
left: auto;
right: 7px;
}

.bootstrap-datetimepicker-widget > ul {
margin: 0;
list-style-type: none;
margin: 0;
}

.bootstrap-datetimepicker-widget .timepicker-hour,
.bootstrap-datetimepicker-widget .timepicker-minute,
.bootstrap-datetimepicker-widget .timepicker-second {
width: 100%;
font-size: 1.2em;
font-weight: bold;
font-size: 1.2em;
}

.bootstrap-datetimepicker-widget table[data-hour-format="12"] .separator {
width: 4px;
padding: 0;
margin: 0;
}

.bootstrap-datetimepicker-widget .datepicker > div {
display: none;
}

.bootstrap-datetimepicker-widget .picker-switch {
text-align: center;
}

.bootstrap-datetimepicker-widget table {
width: 100%;
margin: 0;
}

.bootstrap-datetimepicker-widget td,
.bootstrap-datetimepicker-widget th {
text-align: center;
width: 20px;
height: 20px;
text-align: center;
border-radius: 4px;
}

.bootstrap-datetimepicker-widget td.day:hover,
.bootstrap-datetimepicker-widget td.hour:hover,
.bootstrap-datetimepicker-widget td.minute:hover,
.bootstrap-datetimepicker-widget td.second:hover {
cursor: pointer;
background: #eeeeee;
cursor: pointer;
}

.bootstrap-datetimepicker-widget td.old,
.bootstrap-datetimepicker-widget td.new {
color: #999999;
}

.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);
background-color: #428bca;
}

.bootstrap-datetimepicker-widget td.disabled,
.bootstrap-datetimepicker-widget td.disabled:hover {
background: none;
color: #999999;
cursor: not-allowed;
background: none;
}

.bootstrap-datetimepicker-widget td span {
display: block;
float: left;
width: 47px;
height: 54px;
margin: 2px;
line-height: 54px;
float: left;
margin: 2px;
cursor: pointer;
border-radius: 4px;
}

.bootstrap-datetimepicker-widget td span:hover {
background: #eeeeee;
}

.bootstrap-datetimepicker-widget td span.active {
background-color: #428bca;
color: #fff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #428bca;
}

.bootstrap-datetimepicker-widget td span.old {
color: #999999;
}

.bootstrap-datetimepicker-widget td span.disabled,
.bootstrap-datetimepicker-widget td span.disabled:hover {
background: none;
color: #999999;
cursor: not-allowed;
background: none;
}

.bootstrap-datetimepicker-widget th.switch {
width: 145px;
}

.bootstrap-datetimepicker-widget th.next,
.bootstrap-datetimepicker-widget th.prev {
font-size: 21px;
}

.bootstrap-datetimepicker-widget th.disabled,
.bootstrap-datetimepicker-widget th.disabled:hover {
background: none;
color: #999999;
cursor: not-allowed;
background: none;
}

.bootstrap-datetimepicker-widget thead tr:first-child th {
cursor: pointer;
}

.bootstrap-datetimepicker-widget thead tr:first-child th:hover {
background: #eeeeee;
}

.input-group.date .input-group-addon span {
display: block;
cursor: pointer;
width: 16px;
height: 16px;
cursor: pointer;
}

.bootstrap-datetimepicker-widget.left-oriented:before {
right: 6px;
left: auto;
right: 6px;
}

.bootstrap-datetimepicker-widget.left-oriented:after {
right: 7px;
left: auto;
right: 7px;
}

.bootstrap-datetimepicker-widget ul.list-unstyled li.in div.timepicker div.timepicker-picker table.table-condensed tbody > tr > td {
padding: 0 !important;
padding: 0px !important;
}
7 changes: 3 additions & 4 deletions bootstrap3_datetime/static/bootstrap3_datetime/css/bootstrap-datetimepicker.min.css
100644 → 100755

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8aa28a6

Please sign in to comment.