diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-07-12 02:03:17 -0700 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-07-12 02:03:17 -0700 |
| commit | 79d898ae0ad8c0e66bd63ec3e0904e9e5e7894e8 (patch) | |
| tree | ee8d832ed2f11e9afe62daf0e586a86004eb8d98 /app/helpers/application_helper.rb | |
| parent | bcf7ee48e94cd2e4d2de28e8854e7f0e2b5cad1f (diff) | |
| parent | 056b5ed72f6d980bceeb49eb249b8365fe8fce66 (diff) | |
Merge upstream!! #64 <3 <3
Diffstat (limited to 'app/helpers/application_helper.rb')
| -rw-r--r-- | app/helpers/application_helper.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 36c37fae0..9f50d8bdb 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -31,7 +31,11 @@ module ApplicationHelper Rails.env.production? ? site_title : "#{site_title} (Dev)" end - def fa_icon(icon) - content_tag(:i, nil, class: 'fa ' + icon.split(' ').map { |cl| "fa-#{cl}" }.join(' ')) + def fa_icon(icon, attributes = {}) + class_names = attributes[:class]&.split(' ') || [] + class_names << 'fa' + class_names += icon.split(' ').map { |cl| "fa-#{cl}" } + + content_tag(:i, nil, attributes.merge(class: class_names.join(' '))) end end |