diff --git a/Gemfile b/Gemfile index b4a6805..dc24980 100644 --- a/Gemfile +++ b/Gemfile @@ -26,6 +26,7 @@ gem 'devise', '~> 4.7' # styles gem 'bulma-rails', '~> 0.8.0' +gem 'font_awesome5_rails', '~> 1.1' gem 'premailer-rails', '~> 1.11' group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 5026ec4..e569a26 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,6 +67,8 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) arbre (1.2.1) activesupport (>= 3.0.0) arctic_admin (3.1.1) @@ -84,6 +86,8 @@ GEM concurrent-ruby (1.1.6) connection_pool (2.2.2) crass (1.0.6) + css_parser (1.7.1) + addressable database_cleaner (1.8.3) devise (4.7.1) bcrypt (~> 3.0) @@ -104,15 +108,17 @@ GEM ffi (1.12.2) font-awesome-sass (5.12.0) sassc (>= 1.11) + font_awesome5_rails (1.1.1) + railties (>= 4.2) formtastic (3.1.5) actionpack (>= 3.2.13) formtastic_i18n (0.6.0) - foundation_emails (2.2.1.0) globalid (0.4.2) activesupport (>= 4.2.0) has_scope (0.7.2) actionpack (>= 4.1) activesupport (>= 4.1) + htmlentities (4.3.4) i18n (1.8.2) concurrent-ruby (~> 1.0) inherited_resources (1.11.0) @@ -177,11 +183,19 @@ GEM pg (1.2.3) polyamorous (2.3.2) activerecord (>= 5.2.1) + premailer (1.11.1) + addressable + css_parser (>= 1.6.0) + htmlentities (>= 4.0.0) + premailer-rails (1.11.1) + actionmailer (>= 3) + premailer (~> 1.7, >= 1.7.9) pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) pry-rails (0.3.9) pry (>= 0.10.4) + public_suffix (4.0.4) puma (4.3.3) nio4r (~> 2.0) rack (2.2.2) @@ -352,7 +366,7 @@ DEPENDENCIES devise (~> 4.7) factory_bot_rails (~> 5.1) faker (~> 2.10) - foundation_emails (~> 2.2) + font_awesome5_rails (~> 1.1) jbuilder (~> 2.9) json_spec (~> 1.1) listen (~> 3.2) @@ -361,6 +375,7 @@ DEPENDENCIES multi_json (~> 1.14) paranoia (~> 2.4) pg (~> 1.2) + premailer-rails (~> 1.11) pry-rails puma (~> 4.2) rails (~> 6.0) diff --git a/README.md b/README.md index eae4d0e..e8ecff2 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ This repo is a designed to be a Dockerized Rails 6 template: - `yarn install --check-files` - `Find/replace all TODO` - `docker-compose up --build` + - `Replace FontAwesome Pro kit id in 'app/views/layouts/application.html.erb'` ### Dependencies diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 4539283..f5788a0 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,6 +9,7 @@ <%= stylesheet_link_tag 'application', media: 'all' %> + @@ -21,5 +22,4 @@ <%= javascript_pack_tag 'application' %> <%= javascript_controller_pack_tag_helper %> -