diff options
| author | Valeriy Sizov <vsv2711@gmail.com> | 2012-10-17 03:08:12 -0700 |
|---|---|---|
| committer | Valeriy Sizov <vsv2711@gmail.com> | 2012-10-17 03:08:12 -0700 |
| commit | 7166739086f161ac0f371903e0130cdb192b9f51 (patch) | |
| tree | 3f73260eaac610594e25047bd3693fdc6e02d4ce | |
| parent | d8262573b82ae88abde6447c07b70961950de92c (diff) | |
| parent | 789e4b848c097686182367a5dc7220c7749e4ff4 (diff) | |
| download | gitlab-ce-7166739086f161ac0f371903e0130cdb192b9f51.tar.gz | |
Merge pull request #1715 from riyad/use-font-awesome
Use Font Awsome for icons
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/main.scss | 1 |
3 files changed, 6 insertions, 0 deletions
@@ -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) 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; |