diff --git a/Gemfile b/Gemfile index ecfc613b..02c62ad4 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,6 @@ gem 'devise' gem 'devise-async' gem 'bootstrap_form' gem 'font-kit-rails' -gem 'nprogress-rails' gem 'font-awesome-rails', '~> 4.2.0.0' gem 'rails-assets-growl' gem "paperclip", "~> 4.2" diff --git a/Gemfile.lock b/Gemfile.lock index 9e09452c..dcce2796 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,7 +163,6 @@ GEM mini_portile (~> 0.6.0) nokogumbo (1.2.0) nokogiri - nprogress-rails (0.1.6.3) oauth (0.4.7) omniauth (1.2.2) hashie (>= 1.2, < 4) @@ -368,7 +367,6 @@ DEPENDENCIES jquery-rails jquery-turbolinks mysql2 - nprogress-rails omniauth omniauth-twitter paperclip (~> 4.2) diff --git a/app/assets/javascripts/application.js.erb.coffee b/app/assets/javascripts/application.js.erb.coffee index 5842510d..608983d5 100644 --- a/app/assets/javascripts/application.js.erb.coffee +++ b/app/assets/javascripts/application.js.erb.coffee @@ -3,16 +3,13 @@ #= require jquery.turbolinks #= require turbolinks #= require bootstrap -#= require nprogress -#= require nprogress-turbolinks #= require growl #= require cheet #= require jquery.guillotine #= require sweet-alert #= require_tree . -NProgress.configure - showSpinner: false +Turbolinks.enableProgressBar() window.showNotification = (text, success=true) -> args = diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index e43fa907..06528d5e 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -34,6 +34,8 @@ body { padding-top: $navbar-height; } @import "font-awesome"; -$nprogress-color: darken($navbar-inverse-bg, 15%); -@import 'nprogress'; -@import 'nprogress-bootstrap'; +html.turbolinks-progress-bar::before { + background-color: darken($navbar-inverse-bg, 15%) !important; + box-shadow: 0px 0px 10px darken($navbar-inverse-bg, 15%), 0px 0px 5px darken($navbar-inverse-bg, 15%); + height: 2px !important; +}