Merge pull request #1715 from riyad/use-font-awesome
Use Font Awsome for icons
This commit is contained in:
commit
7166739086
3 changed files with 6 additions and 0 deletions
1
Gemfile
1
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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
@import "bootstrap";
|
||||
@import "bootstrap-responsive";
|
||||
@import 'font-awesome';
|
||||
|
||||
/** GitLab colors **/
|
||||
$link_color:#3A89A3;
|
||||
|
|
Loading…
Add table
Reference in a new issue