From faa3ee34c8d8edb68b81f13cd88d869207110e29 Mon Sep 17 00:00:00 2001
From: Nick Muerdter <nick.muerdter@nrel.gov>
Date: Sat, 16 Apr 2016 14:51:13 -0600
Subject: [PATCH] Fix fontawesome not being found during builds.

Something recently changed with the rails-assets-fontawesome gem,
causing the "fontawesome" file not to be found on fresh installs.
Instead, we need to require "font-awesome".
---
 Gemfile                            | 25 +++++++++++++------------
 Gemfile.lock                       | 13 ++++++++-----
 source/assets/stylesheets/all.scss |  2 +-
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5b3b2b5..dc01c7e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,4 @@
 source "https://rubygems.org"
-source "https://rails-assets.org"
 
 gem "middleman", "~> 3.3.5"
 gem "rake", "~> 10.4.2"
@@ -31,23 +30,25 @@ gem "kramdown", "~> 1.4.1"
 # JSON validation
 gem "multi_json", "~> 1.10.1"
 
-# jQuery
-gem "rails-assets-jquery", "~> 1.11.2"
-
 # Bootstrap
 gem "bootstrap-sass", "~> 3.2.0.1"
 
-# Programmatic bootstrap modals
-gem "rails-assets-bootbox", "~> 4.3.0"
+# JS runtime for execjs (used for asset minification).
+gem "therubyracer", "~> 0.12.2"
 
-# Form validation
-gem "rails-assets-parsleyjs", "~> 2.0.3"
+source "https://rails-assets.org" do
+  # jQuery
+  gem "rails-assets-jquery", "~> 1.11.2"
 
-# Icons
-gem "rails-assets-fontawesome", "~> 4.1.0"
+  # Programmatic bootstrap modals
+  gem "rails-assets-bootbox", "~> 4.3.0"
 
-# JS runtime for execjs (used for asset minification).
-gem "therubyracer", "~> 0.12.2"
+  # Form validation
+  gem "rails-assets-parsleyjs", "~> 2.0.3"
+
+  # Icons
+  gem "rails-assets-font-awesome", "~> 4.1.0"
+end
 
 group :development do
   # Deployment
diff --git a/Gemfile.lock b/Gemfile.lock
index 4aa2190..b4c91ae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -122,7 +122,7 @@ GEM
       rails-assets-bootstrap (>= 3.0.0)
     rails-assets-bootstrap (3.2.0)
       rails-assets-jquery (>= 1.9.0)
-    rails-assets-fontawesome (4.1.0)
+    rails-assets-font-awesome (4.1.0)
     rails-assets-jquery (1.11.2)
     rails-assets-parsleyjs (2.0.3)
     rake (10.4.2)
@@ -175,11 +175,14 @@ DEPENDENCIES
   middleman-livereload (~> 3.3.4)
   middleman-syntax (~> 2.0.0)
   multi_json (~> 1.10.1)
-  rails-assets-bootbox (~> 4.3.0)
-  rails-assets-fontawesome (~> 4.1.0)
-  rails-assets-jquery (~> 1.11.2)
-  rails-assets-parsleyjs (~> 2.0.3)
+  rails-assets-bootbox (~> 4.3.0)!
+  rails-assets-font-awesome (~> 4.1.0)!
+  rails-assets-jquery (~> 1.11.2)!
+  rails-assets-parsleyjs (~> 2.0.3)!
   rake (~> 10.4.2)
   therubyracer (~> 0.12.2)
   tzinfo-data
   wdm (~> 0.1.0)
+
+BUNDLED WITH
+   1.11.2
diff --git a/source/assets/stylesheets/all.scss b/source/assets/stylesheets/all.scss
index ed73f8f..3c72a87 100644
--- a/source/assets/stylesheets/all.scss
+++ b/source/assets/stylesheets/all.scss
@@ -1,5 +1,5 @@
 @import "bootstrap";
-@import "fontawesome";
+@import "font-awesome";
 
 @import "_shared/scaffolding";
 @import "_shared/popup";