Merge pull request #208 from DanTalash/new-features

Fixing CSS issue with datePicker used in input
g00fy- · Nov 13, 2015 · c59e4fc · c59e4fc
2 parents 2af976e + a1aa398
commit c59e4fc
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 6 deletions.
diff --git a/app/scripts/dateRange.js b/app/scripts/dateRange.js
@@ -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) +

diff --git a/app/styles/style.less b/app/styles/style.less
@@ -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;

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "angular-datepicker",
   "license": "MIT",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "main": [
     "./dist/angular-datepicker.js",
     "./dist/angular-datepicker.css"

diff --git a/dist/angular-datepicker.css b/dist/angular-datepicker.css
@@ -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;

diff --git a/dist/angular-datepicker.js b/dist/angular-datepicker.js
@@ -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) +

diff --git a/dist/angular-datepicker.min.css b/dist/angular-datepicker.min.css