Skip to content

Commit c59e4fc

Browse files
committed
Merge pull request #208 from DanTalash/new-features
Fixing CSS issue with datePicker used in input
2 parents 2af976e + a1aa398 commit c59e4fc

File tree

8 files changed

+20
-6
lines changed

8 files changed

+20
-6
lines changed

app/scripts/dateRange.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Module.directive('dateRange', ['$compile', 'datePickerUtils', 'dateTimeConfig',
7373

7474
attrs.onSetDate = 'dateChange';
7575

76-
var template = '<div><table><tr><td valign="top">' +
76+
var template = '<div><table class="date-range"><tr><td valign="top">' +
7777
getTemplate(attrs, pickerIDs[0], 'start', false, scope.end) +
7878
'</td><td valign="top">' +
7979
getTemplate(attrs, pickerIDs[1], 'end', scope.start, false) +

app/styles/style.less

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
@import "variables.less";
22
@import "mixins.less";
33

4+
.date-picker-date-time {
5+
position: absolute;
6+
}
7+
8+
.date-range .date-picker-date-time {
9+
position: inherit;
10+
}
11+
412
[date-picker-wrapper] {
513
position: absolute;
614
min-width: 220px;

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angular-datepicker",
33
"license": "MIT",
4-
"version": "2.0.2",
4+
"version": "2.0.3",
55
"main": [
66
"./dist/angular-datepicker.js",
77
"./dist/angular-datepicker.css"

dist/angular-datepicker.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@
2525
-moz-box-sizing: border-box;
2626
box-sizing: border-box;
2727
}
28+
.date-picker-date-time {
29+
position: absolute;
30+
}
31+
.date-range .date-picker-date-time {
32+
position: inherit;
33+
}
2834
[date-picker-wrapper] {
2935
position: absolute;
3036
min-width: 220px;

dist/angular-datepicker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ Module.directive('dateRange', ['$compile', 'datePickerUtils', 'dateTimeConfig',
645645

646646
attrs.onSetDate = 'dateChange';
647647

648-
var template = '<div><table><tr><td valign="top">' +
648+
var template = '<div><table class="date-range"><tr><td valign="top">' +
649649
getTemplate(attrs, pickerIDs[0], 'start', false, scope.end) +
650650
'</td><td valign="top">' +
651651
getTemplate(attrs, pickerIDs[1], 'end', scope.start, false) +

dist/angular-datepicker.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)