diff --git a/Gemfile.lock b/Gemfile.lock index da36697..49c260e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,6 +10,7 @@ PATH specs: open_fest (0.0.1) devise + font-awesome-sass rails (~> 4.2.3) GEM diff --git a/lib/open_fest/app/assets/images/img b/lib/open_fest/app/assets/images/img new file mode 120000 index 0000000..10e8f7b --- /dev/null +++ b/lib/open_fest/app/assets/images/img @@ -0,0 +1 @@ +../../vendor/initfest/img \ No newline at end of file diff --git a/lib/open_fest/app/assets/stylesheets/open_fest/application.scss b/lib/open_fest/app/assets/stylesheets/open_fest/application.scss index 5815826..1340a6e 100644 --- a/lib/open_fest/app/assets/stylesheets/open_fest/application.scss +++ b/lib/open_fest/app/assets/stylesheets/open_fest/application.scss @@ -1 +1,4 @@ -@import 'initfest/styles'; \ No newline at end of file +@import "font-awesome-sprockets"; +@import "font-awesome"; + +@import 'initfest/styles'; diff --git a/lib/open_fest/open_fest.gemspec b/lib/open_fest/open_fest.gemspec index fd2b825..59c0956 100644 --- a/lib/open_fest/open_fest.gemspec +++ b/lib/open_fest/open_fest.gemspec @@ -17,6 +17,7 @@ Gem::Specification.new do |s| s.add_dependency "rails", "~> 4.2.3" s.add_dependency "devise", ">= 0" + s.add_dependency "font-awesome-sass", ">= 0" s.add_development_dependency "sqlite3" end