diff --git a/Gemfile b/Gemfile index cd4d9b8..781bee4 100644 --- a/Gemfile +++ b/Gemfile @@ -75,6 +75,8 @@ gem 'newrelic_rpm' #group data by day, week, month gem 'groupdate' +gem 'font-awesome-rails', '~> 4.4' + group :development do gem 'capistrano' gem 'capistrano-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 26fe340..fc51885 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -145,6 +145,8 @@ GEM faraday (>= 0.7.4, < 0.10) fastimage (1.7.0) addressable (~> 2.3, >= 2.3.5) + font-awesome-rails (4.4.0.0) + railties (>= 3.2, < 5.0) formtastic (3.1.3) actionpack (>= 3.2.13) formtastic_i18n (0.4.1) @@ -412,6 +414,7 @@ DEPENDENCIES coffee-rails (~> 4.1.0) devise devise-bootstrap-views + font-awesome-rails (~> 4.4) groupdate houston htmlentities diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index f7a01a2..f12561d 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -20,7 +20,7 @@ body { } - +@import "font-awesome"; @import "bootstrap-sprockets"; @import "bootstrap"; @import "devise_bootstrap_views"; diff --git a/app/assets/stylesheets/published_posts/published_post.scss b/app/assets/stylesheets/published_posts/published_post.scss index 0f07540..0d34b40 100644 --- a/app/assets/stylesheets/published_posts/published_post.scss +++ b/app/assets/stylesheets/published_posts/published_post.scss @@ -2,6 +2,7 @@ // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ +@import "font-awesome"; @import "bootstrap-sprockets"; @import "bootstrap"; @import "variables"; @@ -517,4 +518,4 @@ body { } } -} \ No newline at end of file +} diff --git a/app/views/layouts/landing.html.erb b/app/views/layouts/landing.html.erb index 2ec2d64..681cb3f 100644 --- a/app/views/layouts/landing.html.erb +++ b/app/views/layouts/landing.html.erb @@ -10,7 +10,6 @@