From 7fac6005e15d39c0b62303bb88cdd9bdbeb9f7bf Mon Sep 17 00:00:00 2001
From: Jonathan Rochkind <jrochkind@chemheritage.org>
Date: Mon, 19 Nov 2018 10:04:04 -0500
Subject: [PATCH] Remove font-awesome references
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As far as we can tell, browse-everything was not using font-awesome at all. Removing the dependency and references makes the code simpler, less likely to cause dependency conflicts, and generally easier to deal with other subsequent changes.

Technical backwards incompat unlikely to effect many/any:

* If apps were counting on using font-awesome via the rails gem, but were not otherwise declaring it as a dependency,  relying on b-e to include the ruby gem or provide the '@import' in a generated file — they’ll have to do these things themselves.

* There is no longer a ‘fa3’ or ‘fa4’ class added to the BE HTML.  Unlikely to effect anyone unless they had overridden BE HHTML in weird ways; BE itself was not providing any styling making use of these classes.
---
 app/assets/stylesheets/browse_everything.scss   |  2 --
 app/helpers/font_awesome_version_helper.rb      | 17 -----------------
 app/views/browse_everything/index.html.erb      |  2 +-
 browse-everything.gemspec                       |  1 -
 lib/browse-everything.rb                        |  1 -
 .../templates/browse_everything.scss            |  2 --
 6 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 app/helpers/font_awesome_version_helper.rb

diff --git a/app/assets/stylesheets/browse_everything.scss b/app/assets/stylesheets/browse_everything.scss
index 48c4b3d1..1da8eb27 100644
--- a/app/assets/stylesheets/browse_everything.scss
+++ b/app/assets/stylesheets/browse_everything.scss
@@ -1,6 +1,4 @@
 @import 'bootstrap-sprockets';
 @import 'bootstrap';
 
-@import "font-awesome";
-
 @import "browse_everything/browse_everything";
diff --git a/app/helpers/font_awesome_version_helper.rb b/app/helpers/font_awesome_version_helper.rb
deleted file mode 100644
index eb794b4d..00000000
--- a/app/helpers/font_awesome_version_helper.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module FontAwesomeVersionHelper
-  # Determines if the App uses Font Awesome releases 3.x or 4.x
-  # @return [TrueClass, FalseClass]
-  def font_awesome_four?
-    Bundler.environment.specs['font-awesome-rails'].first.version >= Gem::Version.new('4')
-  end
-
-  # Selects one of two HTML element classes depending upon the release of Font Awesome used by the App
-  # @param if3 [String] the Font Awesome 3 HTML class
-  # @param if4 [String] the Font Awesome 4 HTML class
-  # @return [String] the Font Awesome HTML class
-  def fa3or4(if3, if4)
-    font_awesome_four? ? if4 : if3
-  end
-end
diff --git a/app/views/browse_everything/index.html.erb b/app/views/browse_everything/index.html.erb
index edd201ce..7f4c4f9d 100644
--- a/app/views/browse_everything/index.html.erb
+++ b/app/views/browse_everything/index.html.erb
@@ -11,7 +11,7 @@
         <span class="loading-text">Loading...</span>
       </div>
       <div class="ev-browser row" aria-live="polite">
-        <div class="<%=fa3or4('fa3','fa4')%> col-xs-12 ev-files list">
+        <div class="col-xs-12 ev-files list">
           <% if provider.present? %>
             <% if provider.authorized? %>
               <%= render :partial => 'files' %>
diff --git a/browse-everything.gemspec b/browse-everything.gemspec
index aa532dcd..5244a13b 100644
--- a/browse-everything.gemspec
+++ b/browse-everything.gemspec
@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'aws-sdk-s3'
   spec.add_dependency 'bootstrap-sass', '~> 3.2'
   spec.add_dependency 'dropbox_api', '>= 0.1.10'
-  spec.add_dependency 'font-awesome-rails'
   spec.add_dependency 'google-api-client', '~> 0.23'
   spec.add_dependency 'google_drive', '~> 2.1'
   spec.add_dependency 'googleauth', '0.6.6'
diff --git a/lib/browse-everything.rb b/lib/browse-everything.rb
index bf7da7b6..903a0d38 100644
--- a/lib/browse-everything.rb
+++ b/lib/browse-everything.rb
@@ -1,5 +1,4 @@
 # frozen_string_literal: true
 
 require 'bootstrap-sass'
-require 'font-awesome-rails'
 require 'browse_everything'
diff --git a/lib/generators/browse_everything/templates/browse_everything.scss b/lib/generators/browse_everything/templates/browse_everything.scss
index 48c4b3d1..1da8eb27 100644
--- a/lib/generators/browse_everything/templates/browse_everything.scss
+++ b/lib/generators/browse_everything/templates/browse_everything.scss
@@ -1,6 +1,4 @@
 @import 'bootstrap-sprockets';
 @import 'bootstrap';
 
-@import "font-awesome";
-
 @import "browse_everything/browse_everything";