From 30a31d63da9e6d9f9fd1f47f4964a7c9da346f58 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Tue, 16 Oct 2012 20:27:44 +0200 Subject: [PATCH 1/2] Add font-awesome-sass-rails gem --- Gemfile | 1 + Gemfile.lock | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Gemfile b/Gemfile index aacbb8f39dc..8de51690c19 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 ecc25a05100..968a8baf7ca 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) -- GitLab From 789e4b848c097686182367a5dc7220c7749e4ff4 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Tue, 16 Oct 2012 20:48:32 +0200 Subject: [PATCH 2/2] Import Font Awesome styles --- app/assets/stylesheets/main.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index f8cf8e449b4..c821c3c18a8 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; -- GitLab