diff --git a/Gemfile b/Gemfile index aacbb8f39dc645a10f31363583eda8f2c258fba2..8de51690c19893f854c87a30005c88619a382e0b 100644 --- a/Gemfile +++ b/Gemfile @@ -109,6 +109,7 @@ group :assets do gem "modernizr", "2.5.3" gem "raphael-rails", "1.5.2" gem 'bootstrap-sass', "2.0.4" + gem "font-awesome-sass-rails", "~> 2.0.0" end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index ecc25a05100380a8314b4240eac76d048fb9094b..968a8baf7cab4f2f76f237c7eba520701de2f8be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -135,6 +135,9 @@ GEM multipart-post (~> 1.1) ffaker (1.14.0) ffi (1.0.11) + font-awesome-sass-rails (2.0.0.0) + railties (>= 3.1.1) + sass-rails (>= 3.1.1) foreman (0.47.0) thor (>= 0.13.6) gherkin-ruby (0.2.1) @@ -417,6 +420,7 @@ DEPENDENCIES email_spec factory_girl_rails ffaker + font-awesome-sass-rails (~> 2.0.0) foreman git github-linguist (~> 2.3.4) diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index f8cf8e449b4573e23a025d24636904f7a17b437c..c821c3c18a8f1465d465e9590c47a1344104c74a 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -1,5 +1,6 @@ @import "bootstrap"; @import "bootstrap-responsive"; +@import 'font-awesome'; /** GitLab colors **/ $link_color:#3A89A3;