diff --git a/Gemfile b/Gemfile index 0699a7b..1f6be54 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem 'rails', '7.0.4' # Use Puma as the app server gem 'puma', '~> 6.0' # Use sqlite3 as the database for Active Record -gem 'sqlite3', '~> 1.4.1' +gem 'sqlite3', '~> 1.5.3' gem 'mysql2', '~> 0.5.2', group: :production @@ -41,7 +41,7 @@ gem 'listen', '~> 3.7.0', group: :development gem 'bootstrap', '~> 5.1.3' gem "bootstrap_form", "~> 5.0" -gem 'font-awesome-sass', '~> 5.15.1' +gem 'font-awesome-sass', '~> 6.2.0' # Use Diffy for showing translation diffs gem 'diffy' diff --git a/Gemfile.lock b/Gemfile.lock index 71193da..4a09284 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -128,8 +128,8 @@ GEM faraday-rack (1.0.0) faraday-retry (1.0.3) ffi (1.15.5) - font-awesome-sass (5.15.1) - sassc (>= 1.11) + font-awesome-sass (6.2.0) + sassc (~> 2.0) globalid (1.0.0) activesupport (>= 5.0) hashdiff (1.0.1) @@ -276,7 +276,8 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.4.2) + sqlite3 (1.5.3) + mini_portile2 (~> 2.8.0) stringio (3.0.2) strscan (3.0.4) thor (1.2.1) @@ -320,7 +321,7 @@ DEPENDENCIES devise (~> 4.8.0) diff-lcs diffy - font-awesome-sass (~> 5.15.1) + font-awesome-sass (~> 6.2.0) jbuilder (~> 2.11.3) jquery-rails (~> 4.4.0) listen (~> 3.7.0) @@ -335,7 +336,7 @@ DEPENDENCIES rails-i18n (~> 7.0.6) sassc-rails (~> 2.1.2) sdoc (~> 2.4.0) - sqlite3 (~> 1.4.1) + sqlite3 (~> 1.5.3) turbolinks (~> 5.2.1) tzinfo-data uglifier (~> 4.2.0) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 4ee9c55..cb64789 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -17,7 +17,6 @@ @import "bootstrap"; @import "rails_bootstrap_forms"; -@import "font-awesome-sprockets"; @import "font-awesome"; .turbolinks-progress-bar {