got rid of nprogress

This commit is contained in:
nilsding 2015-01-12 15:53:14 +01:00
parent 38e5550241
commit 3574993746
4 changed files with 6 additions and 10 deletions

View File

@ -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"

View File

@ -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)

View File

@ -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 =

View File

@ -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;
}