diff options
| author | Bruno Perles | 2015-11-09 12:18:50 +0100 |
|---|---|---|
| committer | Bruno Perles | 2015-11-10 15:39:21 +0100 |
| commit | 59828c2de43d470023eba9f6f52f0ea2dec00228 (patch) | |
| tree | 5536e0c1d4667f09618aeba0a2336bdd34a82301 /app | |
| parent | eb8407e7fa8fe6e0c41bf8969c76397f68c699c0 (diff) | |
| download | chouette-core-59828c2de43d470023eba9f6f52f0ea2dec00228.tar.bz2 | |
Update jquery-rails and jquey-ui
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/application.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.scss.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 1ae76cd05..7193d0d21 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -6,7 +6,7 @@ // //= require jquery //= require jquery_ujs -//= require jquery.ui.all +//= require jquery-ui //= require modernizr //= require cocoon //= require raphael diff --git a/app/assets/stylesheets/application.scss.erb b/app/assets/stylesheets/application.scss.erb index 770e3c82b..dab6ff320 100644 --- a/app/assets/stylesheets/application.scss.erb +++ b/app/assets/stylesheets/application.scss.erb @@ -25,7 +25,7 @@ $body-bg: #eee; @import "tagmanager/tagmanager"; @import "font-awesome-sprockets"; @import "font-awesome"; -@import "jquery.ui.all"; +@import "jquery-ui"; @import "morrisjs"; @import "formtastic"; @import 'eonasdan-bootstrap-datetimepicker'; |