Skip to content

Commit e8bddc6

Browse files
author
Eonasdan
committed
Merge pull request Eonasdan#1204 from Eonasdan/development
push 4.15.35
2 parents 234c2f0 + 020d229 commit e8bddc6

22 files changed

+247
-96
lines changed

.npmignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
/node_modules
66
/Makefile
77
/test
8-
/build
98
*.log
109
*.swp
1110
*~

Gruntfile.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,17 @@ module.exports = function (grunt) {
8686
production: {
8787
options: {
8888
cleancss: true,
89-
compress: true
89+
compress: true,
90+
paths: 'node_modules'
9091
},
9192
files: {
9293
'build/css/bootstrap-datetimepicker.min.css': 'src/less/bootstrap-datetimepicker-build.less'
9394
}
9495
},
9596
development: {
97+
options: {
98+
paths: 'node_modules'
99+
},
96100
files: {
97101
'build/css/bootstrap-datetimepicker.css': 'src/less/bootstrap-datetimepicker-build.less'
98102
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
## [View the manual and demos](http://eonasdan.github.io/bootstrap-datetimepicker/)
77

8-
# v4.14.30
8+
# v4.15.35
99

1010
Is the current stable release. The latest and greatest changes are available from the [development branch](https://github.com/Eonasdan/bootstrap-datetimepicker/tree/development)
1111

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eonasdan-bootstrap-datetimepicker",
3-
"version": "4.14.30",
3+
"version": "4.15.35",
44
"main": [
55
"build/css/bootstrap-datetimepicker.min.css",
66
"build/js/bootstrap-datetimepicker.min.js"

build/css/bootstrap-datetimepicker.css

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* Datetimepicker for Bootstrap 3
3-
* version : 4.14.30
3+
* version : 4.15.35
44
* https://github.com/Eonasdan/bootstrap-datetimepicker/
55
*/
66
.bootstrap-datetimepicker-widget {
@@ -299,7 +299,8 @@
299299
.bootstrap-datetimepicker-widget table td.today:before {
300300
content: '';
301301
display: inline-block;
302-
border: 0 0 7px 7px solid transparent;
302+
border: solid transparent;
303+
border-width: 0 0 7px 7px;
303304
border-bottom-color: #337ab7;
304305
border-top-color: rgba(0, 0, 0, 0.2);
305306
position: absolute;

build/css/bootstrap-datetimepicker.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/js/bootstrap-datetimepicker.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

component.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bootstrap-datetimepicker",
3-
"version": "4.14.30",
3+
"version": "4.15.35",
44
"main": ["build/css/bootstrap-datetimepicker.min.css","build/js/bootstrap-datetimepicker.min.js"],
55
"dependencies": {
66
"jquery" : ">=1.8.3",

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "eonasdan/bootstrap-datetimepicker",
33
"type": "component",
4-
"version": "4.14.30",
4+
"version": "4.15.35",
55
"description": "Date/time picker widget based on twitter bootstrap",
66
"keywords": [
77
"bootstrap",

docs/ChangeLog.md

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
11
# Version 4
22

3-
## 4.14.40
3+
## 4.15.35
4+
5+
### New Features
6+
7+
`tooltips` allows custom, localized text to be included for icon tooltips
8+
9+
### Bug Squashing
10+
11+
fixed #1066
12+
13+
fixed #1087 `sideBySide` properly supports `toolbarPlacement [top, bottom]`
14+
15+
fixed #1119
16+
17+
fixed #1069 added input.blur()
18+
19+
fixed #1049 fixed doc example
20+
21+
fixed #999 picker now looks for an element with `.input-group-addon`
22+
23+
24+
## 4.14.30
425

526
### New Features
627

0 commit comments

Comments
 (0)