From 92dda30639cd4c349548718c052250734bd5a672 Mon Sep 17 00:00:00 2001 From: Nikita Kholin Date: Tue, 31 Jan 2017 11:33:52 +0200 Subject: [PATCH] Add fontawesome --- Gemfile | 2 ++ Gemfile.lock | 3 +++ app/assets/stylesheets/application.sass | 4 ++++ 3 files changed, 9 insertions(+) create mode 100644 app/assets/stylesheets/application.sass diff --git a/Gemfile b/Gemfile index 60fdb40..708c87d 100644 --- a/Gemfile +++ b/Gemfile @@ -9,6 +9,7 @@ end gem 'bootstrap', '~> 4.0.0.alpha6' gem 'coffee-rails', '~> 4.2' gem 'devise' +gem 'font-awesome-rails' gem 'jbuilder', '~> 2.5' gem 'jquery-rails' gem 'pg', '~> 0.18' @@ -20,6 +21,7 @@ gem 'simple_form' gem 'slim-rails' gem 'turbolinks', '~> 5' gem 'uglifier', '>= 1.3.0' + group :development, :test do gem 'byebug', platform: :mri gem 'factory_girl_rails' diff --git a/Gemfile.lock b/Gemfile.lock index 421e883..5c5cb3c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,6 +99,8 @@ GEM faker (1.7.2) i18n (~> 0.5) ffi (1.9.17) + font-awesome-rails (4.7.0.1) + railties (>= 3.2, < 5.1) formatador (0.2.5) globalid (0.3.7) activesupport (>= 4.1.0) @@ -316,6 +318,7 @@ DEPENDENCIES devise factory_girl_rails faker + font-awesome-rails guard-rspec jbuilder (~> 2.5) jquery-rails diff --git a/app/assets/stylesheets/application.sass b/app/assets/stylesheets/application.sass new file mode 100644 index 0000000..5493ef4 --- /dev/null +++ b/app/assets/stylesheets/application.sass @@ -0,0 +1,4 @@ +@import "bootstrap" +@import "font-awesome" +@import "notifications" +@import "rooms"