diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js index 8bc986290a..f34d7bfc40 100644 --- a/app/assets/javascripts/admin/all.js +++ b/app/assets/javascripts/admin/all.js @@ -9,7 +9,7 @@ //= require jquery-migrate-min //= require jquery_ujs //= require jquery-ui -//= require shared/jquery-ui-timepicker-addon +//= require jquery-ui-timepicker-addon //= require angular //= require angular-resource //= require angular-animate diff --git a/app/assets/stylesheets/admin/all.scss b/app/assets/stylesheets/admin/all.scss index 4a16154bf4..37b1ca7e92 100644 --- a/app/assets/stylesheets/admin/all.scss +++ b/app/assets/stylesheets/admin/all.scss @@ -7,9 +7,10 @@ *= require admin/spree_backend *= require admin/spree_auth - *= require shared/jquery-ui-timepicker-addon + *= require jquery-ui-timepicker-addon *= require shared/textAngular *= require shared/ng-tags-input.min + *= require admin/custom *= require_self */ diff --git a/app/assets/stylesheets/admin/custom.css b/app/assets/stylesheets/admin/custom.css new file mode 100644 index 0000000000..bf6dc03bc1 --- /dev/null +++ b/app/assets/stylesheets/admin/custom.css @@ -0,0 +1,2 @@ +/* Custom fix */ +.ui-timepicker-div.ui-timepicker-oneLine dl dd { width: 25%; } diff --git a/app/assets/javascripts/shared/jquery-ui-timepicker-addon.js b/vendor/assets/javascripts/jquery-ui-timepicker-addon.js similarity index 100% rename from app/assets/javascripts/shared/jquery-ui-timepicker-addon.js rename to vendor/assets/javascripts/jquery-ui-timepicker-addon.js diff --git a/app/assets/stylesheets/shared/jquery-ui-timepicker-addon.css b/vendor/assets/stylesheets/jquery-ui-timepicker-addon.css similarity index 96% rename from app/assets/stylesheets/shared/jquery-ui-timepicker-addon.css rename to vendor/assets/stylesheets/jquery-ui-timepicker-addon.css index 9a6e01102e..7c62ee8454 100644 --- a/app/assets/stylesheets/shared/jquery-ui-timepicker-addon.css +++ b/vendor/assets/stylesheets/jquery-ui-timepicker-addon.css @@ -28,6 +28,3 @@ .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; } - -/* Custom fix */ -.ui-timepicker-div.ui-timepicker-oneLine dl dd { width: 25%; }