added FontAwesome and NProgress
This commit is contained in:
parent
f3e5ce3e2b
commit
1554b4b9f5
1
Gemfile
1
Gemfile
|
@ -24,6 +24,7 @@ gem 'devise'
|
|||
gem 'bootstrap_form'
|
||||
gem 'font-kit-rails'
|
||||
gem 'nprogress-rails'
|
||||
gem 'font-awesome-rails', '~> 4.2.0.0'
|
||||
|
||||
group :development do
|
||||
gem 'thin'
|
||||
|
|
|
@ -54,6 +54,8 @@ GEM
|
|||
erubis (2.7.0)
|
||||
eventmachine (1.0.3)
|
||||
execjs (2.2.2)
|
||||
font-awesome-rails (4.2.0.0)
|
||||
railties (>= 3.2, < 5.0)
|
||||
font-kit-rails (1.1.0)
|
||||
rails
|
||||
haml (4.0.5)
|
||||
|
@ -158,6 +160,7 @@ DEPENDENCIES
|
|||
bootswatch-rails (~> 3.2.0)
|
||||
coffee-rails (~> 4.1.0)
|
||||
devise
|
||||
font-awesome-rails (~> 4.2.0.0)
|
||||
font-kit-rails
|
||||
haml
|
||||
http_accept_language
|
||||
|
|
|
@ -2,5 +2,9 @@
|
|||
#= require jquery_ujs
|
||||
#= require turbolinks
|
||||
#= require bootstrap
|
||||
#= require nprogress
|
||||
#= require nprogress-turbolinks
|
||||
#= require_tree .
|
||||
|
||||
NProgress.configure
|
||||
showSpinner: false
|
|
@ -2,8 +2,14 @@
|
|||
*= require rails_bootstrap_forms
|
||||
*= require_self
|
||||
*/
|
||||
|
||||
@import "bootswatch/flatly/variables";
|
||||
@import "bootstrap";
|
||||
body { padding-top: $navbar-height; }
|
||||
@import "bootswatch/flatly/bootswatch";
|
||||
@import "base";
|
||||
|
||||
@import "font-awesome";
|
||||
|
||||
@import 'nprogress';
|
||||
@import 'nprogress-bootstrap';
|
Loading…
Reference in New Issue