From 7c34795a1abc385ac2039417b130ca48cf9dd434 Mon Sep 17 00:00:00 2001 From: Paul Chavard Date: Wed, 15 Apr 2020 17:41:05 +0200 Subject: [PATCH] Bring back font-awesome-rails we need it untill we remove all the old admin pages --- Gemfile | 1 + Gemfile.lock | 3 +++ app/assets/stylesheets/application.scss | 1 + 3 files changed, 5 insertions(+) diff --git a/Gemfile b/Gemfile index 14407ddc5..be4cfbaea 100644 --- a/Gemfile +++ b/Gemfile @@ -28,6 +28,7 @@ gem 'dotenv-rails', require: 'dotenv/rails-now' # dotenv should always be loaded gem 'flipper' gem 'flipper-active_record' gem 'flipper-ui' +gem 'font-awesome-rails' gem 'fugit' gem 'geocoder' gem 'gon' diff --git a/Gemfile.lock b/Gemfile.lock index 7e80e2d2b..5544e433f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -236,6 +236,8 @@ GEM fog-core (~> 2.1) fog-json (>= 1.0) ipaddress (>= 0.8) + font-awesome-rails (4.7.0.5) + railties (>= 3.2, < 6.1) formatador (0.2.5) fugit (1.3.3) et-orbi (~> 1.1, >= 1.1.8) @@ -751,6 +753,7 @@ DEPENDENCIES flipper flipper-active_record flipper-ui + font-awesome-rails fugit geocoder gon diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 121de171b..ee4b980da 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -33,6 +33,7 @@ // = require attestation_template_edit // = require_self +// = require font-awesome // = require leaflet // = require franceconnect // = require bootstrap-wysihtml5