Merge branch 'master' of https://github.com/tempusdominus/bootstrap-4

tempusdominus · Dec 15, 2017 · ff9dcb8 · ff9dcb8
2 parents d480f66 + 74e93c6
commit ff9dcb8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/build/css/tempusdominus-bootstrap-4.css b/build/css/tempusdominus-bootstrap-4.css
@@ -20,7 +20,7 @@
     display: block;
     margin: 2px 0;
     padding: 4px;
-    width: 12.8vw; }
+    width: 12.8rem; }
     @media (min-width: 576px) {
       .bootstrap-datetimepicker-widget.dropdown-menu.timepicker-sbs {
         width: 38em; } }

diff --git a/src/js/tempusdominus-bootstrap-4.js b/src/js/tempusdominus-bootstrap-4.js
@@ -278,15 +278,15 @@ const TempusDominusBootstrap4 = ($ => { // eslint-disable-line no-unused-vars
                 self.widget.removeClass('float-right');
             }
 
-            // find the first parent element that has a static css positioning
-            if (parent.css('position') !== 'static') {
+            // find the first parent element that has a relative css positioning
+            if (parent.css('position') !== 'relative') {
                 parent = parent.parents().filter(function () {
-                    return $(this).css('position') === 'static';
+                    return $(this).css('position') === 'relative';
                 }).first();
             }
 
             if (parent.length === 0) {
-                throw new Error('datetimepicker component should be placed within a static positioned container');
+                throw new Error('datetimepicker component should be placed within a relative positioned container');
             }
 
             self.widget.css({