diff --git a/Gemfile b/Gemfile index 326bfca..fefe5f6 100755 --- a/Gemfile +++ b/Gemfile @@ -13,8 +13,8 @@ gem 'webrick', '1.3.1' # Gems used only for assets and not required # in production environments by default. - gem 'sass-rails', '~> 3.2' - gem 'coffee-rails', '~> 3.2.1' + gem 'sass-rails', '~> 4.0.0' + gem 'coffee-rails', '~> 4.0.0' gem 'bootstrap-sass','~> 2.3.2.1' group :assets do @@ -102,7 +102,7 @@ gem 'rmagick' gem 'bootstrap-addons-rails' gem "jquery-fileupload-rails", "0.4.1" -gem "jquery-ui-rails","~> 4.1.1" +gem "jquery-ui-rails","~> 4.2.0" gem "font-awesome-rails" gem "jquery-datetimepicker-rails" # gem "jquery-sortable-rails" diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 827eddf..5ff02ef 100755 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -12,6 +12,10 @@ * require_tree . *= require 'calendars' *= require jquery.fileupload-ui +*= require jquery.ui.progressbar +*= require jquery.datetimepicker +*= require jquery.ui.dialog +*= require jquery.ui.tabs * require 'bootstrap' *= require 'tinymce' diff --git a/app/assets/stylesheets/themes/blue2/application.css.scss b/app/assets/stylesheets/themes/blue2/application.css.scss index 4e48983..07388ee 100755 --- a/app/assets/stylesheets/themes/blue2/application.css.scss +++ b/app/assets/stylesheets/themes/blue2/application.css.scss @@ -17,6 +17,8 @@ *= require jquery.datetimepicker *= require jquery.ui.dialog *= require jquery.ui.tabs + *= require jquery.ui.progressbar + * require 'bootstrap' * require 'neuigkeiten' diff --git a/app/views/home/infoscreen.html.erb b/app/views/home/infoscreen.html.erb index 3bc70dc..732abb8 100644 --- a/app/views/home/infoscreen.html.erb +++ b/app/views/home/infoscreen.html.erb @@ -53,8 +53,8 @@ <% end %> -