Skip to content
This repository has been archived by the owner on Dec 29, 2022. It is now read-only.

Commit

Permalink
Fix fontawesome not being found during builds.
Browse files Browse the repository at this point in the history
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".
  • Loading branch information
GUI committed Apr 16, 2016
1 parent 265714d commit faa3ee3
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 18 deletions.
25 changes: 13 additions & 12 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
source "https://rubygems.org"
source "https://rails-assets.org"

gem "middleman", "~> 3.3.5"
gem "rake", "~> 10.4.2"
Expand Down Expand Up @@ -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
Expand Down
13 changes: 8 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion source/assets/stylesheets/all.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "bootstrap";
@import "fontawesome";
@import "font-awesome";

@import "_shared/scaffolding";
@import "_shared/popup";
Expand Down

0 comments on commit faa3ee3

Please sign in to comment.