diff --git a/Gemfile b/Gemfile index e445969d..19c858b4 100644 --- a/Gemfile +++ b/Gemfile @@ -45,6 +45,7 @@ gem 'bcrypt', '~> 3.1.7' # gem 'jbuilder', '~> 1.2' gem "bootstrap-sass", "3.3.3" +gem "font-awesome-sass", "~> 4.5.0" group :development do gem "spring" diff --git a/Gemfile.lock b/Gemfile.lock index bc840560..05283aaa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -98,6 +98,8 @@ GEM factory_girl (~> 4.5.0) railties (>= 3.0.0) ffi (1.9.6) + font-awesome-sass (4.5.0) + sass (>= 3.2) gherkin (2.12.2) multi_json (~> 1.3) hike (1.2.3) @@ -251,6 +253,7 @@ DEPENDENCIES cucumber-rails database_cleaner factory_girl_rails + font-awesome-sass (~> 4.5.0) htmlentities jquery-rails jquery-ui-rails diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index a8233655..222ff520 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -18,6 +18,8 @@ @import "jquery-ui/dialog"; @import "jquery-ui/sortable"; +@import "icons"; + .legacy-ui { @import "../../../vendor/assets/stylesheets/superfish-navbar"; @import "../../../vendor/assets/stylesheets/superfish-vertical"; diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss new file mode 100644 index 00000000..001bc336 --- /dev/null +++ b/app/assets/stylesheets/icons.scss @@ -0,0 +1,2 @@ +@import "font-awesome-sprockets"; +@import "font-awesome";