Skip to content

Commit

Permalink
Fixing CSS issue
Browse files Browse the repository at this point in the history
* A previous change erroneously removed a CSS rule which was used to
offset the popup div in order to get the date-range directive working.
* Restored this CSS rule, and added a new rule for date-range directive
to fix the previous problem.
  • Loading branch information
DanTalash committed Nov 13, 2015
1 parent 10f3064 commit 1dd04f4
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 4 deletions.
2 changes: 1 addition & 1 deletion app/scripts/dateRange.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Module.directive('dateRange', ['$compile', 'datePickerUtils', 'dateTimeConfig',

attrs.onSetDate = 'dateChange';

var template = '<div><table><tr><td valign="top">' +
var template = '<div><table class="date-range"><tr><td valign="top">' +
getTemplate(attrs, pickerIDs[0], 'start', false, scope.end) +
'</td><td valign="top">' +
getTemplate(attrs, pickerIDs[1], 'end', scope.start, false) +
Expand Down
8 changes: 8 additions & 0 deletions app/styles/style.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
@import "variables.less";
@import "mixins.less";

.date-picker-date-time {
position: absolute;
}

.date-range .date-picker-date-time {
position: inherit;
}

[date-picker-wrapper] {
position: absolute;
min-width: 220px;
Expand Down
6 changes: 6 additions & 0 deletions dist/angular-datepicker.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.date-picker-date-time {
position: absolute;
}
.date-range .date-picker-date-time {
position: inherit;
}
[date-picker-wrapper] {
position: absolute;
min-width: 220px;
Expand Down
2 changes: 1 addition & 1 deletion dist/angular-datepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ Module.directive('dateRange', ['$compile', 'datePickerUtils', 'dateTimeConfig',

attrs.onSetDate = 'dateChange';

var template = '<div><table><tr><td valign="top">' +
var template = '<div><table class="date-range"><tr><td valign="top">' +
getTemplate(attrs, pickerIDs[0], 'start', false, scope.end) +
'</td><td valign="top">' +
getTemplate(attrs, pickerIDs[1], 'end', scope.start, false) +
Expand Down
2 changes: 1 addition & 1 deletion dist/angular-datepicker.min.css

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

Loading

0 comments on commit 1dd04f4

Please sign in to comment.