diff --git a/src/jquery-ui-sliderAccess.js b/src/jquery-ui-sliderAccess.js index b075c66..820efc5 100644 --- a/src/jquery-ui-sliderAccess.js +++ b/src/jquery-ui-sliderAccess.js @@ -43,8 +43,8 @@ $buttons.children('button').each(function(j, jobj){ var $jt = $(this); $jt.button({ - text: o.text, - icons: { primary: $jt.data('icon') } + showLabel: o.text, + icon: $jt.data('icon') }) .click(function(e){ var step = $jt.data('step'), @@ -72,7 +72,7 @@ $t[o.where]($buttons); if(o.buttonset){ - $buttons.removeClass('ui-corner-right').removeClass('ui-corner-left').buttonset(); + $buttons.removeClass('ui-corner-right').removeClass('ui-corner-left').controlgroup(); $buttons.eq(0).addClass('ui-corner-left'); $buttons.eq(1).addClass('ui-corner-right'); } @@ -88,4 +88,4 @@ } }); -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/src/jquery-ui-timepicker-addon.css b/src/jquery-ui-timepicker-addon.css index 586a7f0..be026c3 100644 --- a/src/jquery-ui-timepicker-addon.css +++ b/src/jquery-ui-timepicker-addon.css @@ -5,8 +5,10 @@ .ui-timepicker-div td { font-size: 90%; } .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; } .ui-timepicker-div .ui_tpicker_unit_hide{ display: none; } +/*Fix icon alignment with jQuery UI 1.12*/ +.ui-datepicker .ui-timepicker-div .ui-icon {left: 50%; top: 50%;} -.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input { background: none; color: inherit; border: none; outline: none; border-bottom: solid 1px #555; width: 95%; } +.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input { background: none; color: inherit; border: none; outline: none; border-bottom: solid 0 #555; width: 95%; } .ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input:focus { border-bottom-color: #aaa; } .ui-timepicker-rtl{ direction: rtl; } @@ -27,4 +29,4 @@ .ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_millisec:before, .ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_microsec:before { content:'.'; display:inline-block; } .ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide, -.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide:before{ display: none; } \ No newline at end of file +.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide:before{ display: none; }