Merge pull request #8 from janisto/update-timepicker

Update jQuery timepicker addon to 1.4
magefad · Oct 21, 2013 · f2e2ca1 · f2e2ca1
2 parents f89caad + fcdce78
commit f2e2ca1
Show file tree

Hide file tree

Showing 6 changed files with 577 additions and 548 deletions.
diff --git a/EJuiDateTimePicker.php b/EJuiDateTimePicker.php
@@ -125,7 +125,7 @@ public function run()
     protected function registerClientScript()
     {
         $cs = Yii::app()->clientScript;
-        $cs->registerCssFile($this->assetsUrl . '/jquery-ui-timepicker-addon.css');
+        $cs->registerCssFile($this->assetsUrl . '/jquery-ui-timepicker-addon'. (YII_DEBUG ? '' : '.min') .'.css');
         $cs->registerScriptFile($this->assetsUrl .'/jquery-ui-timepicker-addon'. (YII_DEBUG ? '' : '.min') .'.js', CClientScript::POS_END);
 
         if ($this->language != 'en') {

diff --git a/assets/jquery-ui-timepicker-addon.css b/assets/jquery-ui-timepicker-addon.css
@@ -1,10 +1,11 @@
 .ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
 .ui-timepicker-div dl { text-align: left; }
-.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
-.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
+.ui-timepicker-div dl dt { float: left; clear:left; padding: 0 0 0 5px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 40%; }
 .ui-timepicker-div td { font-size: 90%; }
 .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
 
 .ui-timepicker-rtl{ direction: rtl; }
-.ui-timepicker-rtl dl { text-align: right; }
-.ui-timepicker-rtl dl dd { margin: 0 65px 10px 10px; }
+.ui-timepicker-rtl dl { text-align: right; padding: 0 5px 0 0; }
+.ui-timepicker-rtl dl dt{ float: right; clear: right; }
+.ui-timepicker-rtl dl dd { margin: 0 40% 10px 10px; }