From cdbc7593f624999cbd9ebb7b205b97a244f2cff3 Mon Sep 17 00:00:00 2001 From: Alex Kotov Date: Sat, 24 Nov 2018 00:38:56 +0500 Subject: [PATCH] Configure Font-Awesome --- Gemfile | 3 +++ Gemfile.lock | 6 ++++++ app/assets/stylesheets/application.scss | 2 ++ app/views/layouts/application.html.erb | 16 ++++++++-------- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 7ead611..ef0b9ce 100644 --- a/Gemfile +++ b/Gemfile @@ -55,6 +55,9 @@ gem 'jquery-rails', '~> 4.3' # responsive, mobile first projects on the web. gem 'bootstrap', '~> 4.1.3' +# Font-Awesome SASS gem for use in Ruby projects. +gem 'font-awesome-sass', '~> 5.5.0' + group :development, :test do # factory_bot provides a framework and DSL for defining and using factories. gem 'factory_bot_rails', '~> 4.10' diff --git a/Gemfile.lock b/Gemfile.lock index 0e20676..ea6bec3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -71,6 +71,8 @@ GEM faker (1.9.1) i18n (>= 0.7) ffi (1.9.25) + font-awesome-sass (5.5.0.1) + sassc (>= 1.11) globalid (0.4.1) activesupport (>= 4.2.0) i18n (1.1.1) @@ -183,6 +185,9 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + sassc (2.0.0) + ffi (~> 1.9.6) + rake simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -230,6 +235,7 @@ DEPENDENCIES database_cleaner (~> 1.7) factory_bot_rails (~> 4.10) faker (~> 1.8) + font-awesome-sass (~> 5.5.0) jquery-rails (~> 4.3) listen (>= 3.0.5, < 3.2) pg (>= 0.18, < 2.0) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index f9030ae..4fbb9f3 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1 +1,3 @@ @import 'bootstrap'; +@import 'font-awesome-sprockets'; +@import 'font-awesome'; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 04bbcea..0379347 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -28,46 +28,46 @@