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

added FontAwesome and NProgress

This commit is contained in:
nilsding 2014-11-02 19:02:53 +01:00
parent f3e5ce3e2b
commit 1554b4b9f5
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@ -24,6 +24,7 @@ gem 'devise'
gem 'bootstrap_form' gem 'bootstrap_form'
gem 'font-kit-rails' gem 'font-kit-rails'
gem 'nprogress-rails' gem 'nprogress-rails'
gem 'font-awesome-rails', '~> 4.2.0.0'
group :development do group :development do
gem 'thin' gem 'thin'

3
Gemfile.lock
View File

@ -54,6 +54,8 @@ GEM
erubis (2.7.0) erubis (2.7.0)
eventmachine (1.0.3) eventmachine (1.0.3)
execjs (2.2.2) execjs (2.2.2)
font-awesome-rails (4.2.0.0)
railties (>= 3.2, < 5.0)
font-kit-rails (1.1.0) font-kit-rails (1.1.0)
rails rails
haml (4.0.5) haml (4.0.5)
@ -158,6 +160,7 @@ DEPENDENCIES
bootswatch-rails (~> 3.2.0) bootswatch-rails (~> 3.2.0)
coffee-rails (~> 4.1.0) coffee-rails (~> 4.1.0)
devise devise
font-awesome-rails (~> 4.2.0.0)
font-kit-rails font-kit-rails
haml haml
http_accept_language http_accept_language

4
app/assets/javascripts/application.coffee
View File

@ -2,5 +2,9 @@
#= require jquery_ujs #= require jquery_ujs
#= require turbolinks #= require turbolinks
#= require bootstrap #= require bootstrap
#= require nprogress
#= require nprogress-turbolinks
#= require_tree . #= require_tree .
NProgress.configure
showSpinner: false

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

@ -2,8 +2,14 @@
*= require rails_bootstrap_forms *= require rails_bootstrap_forms
*= require_self *= require_self
*/ */
@import "bootswatch/flatly/variables"; @import "bootswatch/flatly/variables";
@import "bootstrap"; @import "bootstrap";
body { padding-top: $navbar-height; } body { padding-top: $navbar-height; }
@import "bootswatch/flatly/bootswatch"; @import "bootswatch/flatly/bootswatch";
@import "base"; @import "base";
@import "font-awesome";
@import 'nprogress';
@import 'nprogress-bootstrap';