diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js index 76a286cc43..13e358b4fd 100644 --- a/app/assets/javascripts/admin/all.js +++ b/app/assets/javascripts/admin/all.js @@ -16,6 +16,7 @@ //= require jquery.jstree/jquery.jstree //= require jquery.vAlign //= require jquery.horizontalNav +//= require jquery.adaptivemenu //= require angular //= require angular-resource //= require angular-animate @@ -29,10 +30,8 @@ // spree //= require spree //= require admin/spree-select2 -//= require admin/spree_backend //= require modernizr //= require spin -//= require jquery.adaptivemenu //= require equalize //= require css_browser_selector_dev //= require responsive-tables diff --git a/app/assets/javascripts/admin/spree/base.js.erb b/app/assets/javascripts/admin/spree/base.js.erb index b9ba57d9ff..4820c3d107 100644 --- a/app/assets/javascripts/admin/spree/base.js.erb +++ b/app/assets/javascripts/admin/spree/base.js.erb @@ -1,6 +1,6 @@ //= require_self //= require admin/handlebar_extensions -//= require admin/variant_autocomplete +//= require admin/spree/orders/variant_autocomplete /** This is a collection of javascript functions and whatnot diff --git a/app/assets/javascripts/admin/spree/image_settings.js.erb b/app/assets/javascripts/admin/spree/image_settings.js.erb index 161a3c7164..d8c0b2a635 100644 --- a/app/assets/javascripts/admin/spree/image_settings.js.erb +++ b/app/assets/javascripts/admin/spree/image_settings.js.erb @@ -56,7 +56,4 @@ $(document).ready(function() { index += 1; return html; }; - - - }); diff --git a/app/assets/stylesheets/admin/all.scss b/app/assets/stylesheets/admin/all.scss index cd8063d43f..e0c987e41d 100644 --- a/app/assets/stylesheets/admin/all.scss +++ b/app/assets/stylesheets/admin/all.scss @@ -4,11 +4,10 @@ * the top of the compiled file, but it's generally better to create a new file per style scope. * - *= require admin/spree_backend - *= require jquery.powertip - *= require responsive-tables *= require normalize *= require skeleton + *= require responsive-tables + *= require jquery.powertip *= require jquery.ui.datepicker *= require jquery-ui-timepicker-addon *= require shared/textAngular