From 14eb6b035b9f8d922d4cf2cb0a7b9cbb4d916721 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Tue, 13 Jan 2015 19:49:43 +0100
Subject: [PATCH] Revert "got rid of nprogress"
This reverts commit 3574993746dacaa5740145abd21221fd469cf084.
---
Gemfile | 1 +
Gemfile.lock | 2 ++
app/assets/javascripts/application.js.erb.coffee | 5 ++++-
app/assets/stylesheets/application.css.scss | 8 +++-----
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Gemfile b/Gemfile
index d5ac1fad..6d635877 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,6 +28,7 @@ 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 2558c5a5..b76ce586 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -165,6 +165,7 @@ 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)
@@ -378,6 +379,7 @@ DEPENDENCIES
jquery-rails
jquery-turbolinks
mysql2
+ nprogress-rails
omniauth
omniauth-tumblr
omniauth-twitter
diff --git a/app/assets/javascripts/application.js.erb.coffee b/app/assets/javascripts/application.js.erb.coffee
index 608983d5..5842510d 100644
--- a/app/assets/javascripts/application.js.erb.coffee
+++ b/app/assets/javascripts/application.js.erb.coffee
@@ -3,13 +3,16 @@
#= require jquery.turbolinks
#= require turbolinks
#= require bootstrap
+#= require nprogress
+#= require nprogress-turbolinks
#= require growl
#= require cheet
#= require jquery.guillotine
#= require sweet-alert
#= require_tree .
-Turbolinks.enableProgressBar()
+NProgress.configure
+ showSpinner: false
window.showNotification = (text, success=true) ->
args =
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 06528d5e..e43fa907 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -34,8 +34,6 @@ body { padding-top: $navbar-height; }
@import "font-awesome";
-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;
-}
+$nprogress-color: darken($navbar-inverse-bg, 15%);
+@import 'nprogress';
+@import 'nprogress-bootstrap';