Download as
Browse Code »

Commit 7166739086f161ac0f371903e0130cdb192b9f51

Authored by Valeriy Sizov
2 parents d8262573 789e4b84
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #1715 from riyad/use-font-awesome 

Use Font Awsome for icons
Showing 3 changed files with 6 additions and 0 deletions   Show diff stats
Gemfile
  Diff comments   View file @7166739
... ... @@ -109,6 +109,7 @@ group :assets do
109 109 gem "modernizr", "2.5.3"
110 110 gem "raphael-rails", "1.5.2"
111 111 gem 'bootstrap-sass', "2.0.4"
  112 + gem "font-awesome-sass-rails", "~> 2.0.0"
112 113 end
113 114  
114 115 group :development do
... ...
Gemfile.lock
  Diff comments   View file @7166739
... ... @@ -135,6 +135,9 @@ GEM
135 135 multipart-post (~> 1.1)
136 136 ffaker (1.14.0)
137 137 ffi (1.0.11)
  138 + font-awesome-sass-rails (2.0.0.0)
  139 + railties (>= 3.1.1)
  140 + sass-rails (>= 3.1.1)
138 141 foreman (0.47.0)
139 142 thor (>= 0.13.6)
140 143 gherkin-ruby (0.2.1)
... ... @@ -417,6 +420,7 @@ DEPENDENCIES
417 420 email_spec
418 421 factory_girl_rails
419 422 ffaker
  423 + font-awesome-sass-rails (~> 2.0.0)
420 424 foreman
421 425 git
422 426 github-linguist (~> 2.3.4)
... ...
app/assets/stylesheets/main.scss
  Diff comments   View file @7166739
1 1 @import "bootstrap";
2 2 @import "bootstrap-responsive";
  3 +@import 'font-awesome';
3 4  
4 5 /** GitLab colors **/
5 6 $link_color:#3A89A3;
... ...