FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into navbar-color 

Conflicts:
	app/assets/stylesheets/application.css.scss
This commit is contained in:
nilsding 2015-01-13 21:56:00 +01:00
parent 0ee58e0d20 14eb6b035b
commit 3d34f916c9
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@ -28,6 +28,7 @@ gem 'devise'
gem 'devise-async' gem 'devise-async'
gem 'bootstrap_form' gem 'bootstrap_form'
gem 'font-kit-rails' gem 'font-kit-rails'
gem 'nprogress-rails'
gem 'font-awesome-rails', '~> 4.2.0.0' gem 'font-awesome-rails', '~> 4.2.0.0'
gem 'rails-assets-growl' gem 'rails-assets-growl'
gem "paperclip", "~> 4.2" gem "paperclip", "~> 4.2"

2
Gemfile.lock
View File

@ -165,6 +165,7 @@ GEM
mini_portile (~> 0.6.0) mini_portile (~> 0.6.0)
nokogumbo (1.2.0) nokogumbo (1.2.0)
nokogiri nokogiri
nprogress-rails (0.1.6.3)
oauth (0.4.7) oauth (0.4.7)
omniauth (1.2.2) omniauth (1.2.2)
hashie (>= 1.2, < 4) hashie (>= 1.2, < 4)
@ -378,6 +379,7 @@ DEPENDENCIES
jquery-rails jquery-rails
jquery-turbolinks jquery-turbolinks
mysql2 mysql2
nprogress-rails
omniauth omniauth
omniauth-tumblr omniauth-tumblr
omniauth-twitter omniauth-twitter

5
app/assets/javascripts/application.js.erb.coffee
View File

@ -3,13 +3,16 @@
#= require jquery.turbolinks #= require jquery.turbolinks
#= require turbolinks #= require turbolinks
#= require bootstrap #= require bootstrap
#= require nprogress
#= require nprogress-turbolinks
#= require growl #= require growl
#= require cheet #= require cheet
#= require jquery.guillotine #= require jquery.guillotine
#= require sweet-alert #= require sweet-alert
#= require_tree . #= require_tree .
Turbolinks.enableProgressBar() NProgress.configure
showSpinner: false
window.showNotification = (text, success=true) -> window.showNotification = (text, success=true) ->
args = args =

9
app/assets/stylesheets/application.css.scss
View File

@ -49,9 +49,6 @@ body { padding-top: $navbar-height; }
@import "font-awesome"; @import "font-awesome";
html.turbolinks-progress-bar::before { $nprogress-color: darken($navbar-inverse-bg, 15%);
background-color: darken($navbar-inverse-bg, 15%) !important; @import 'nprogress';
box-shadow: 0px 0px 10px darken($navbar-inverse-bg, 15%), 0px 0px 5px darken($navbar-inverse-bg, 15%); @import 'nprogress-bootstrap';
height: 2px !important;
}