diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-03-18 11:17:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-18 11:17:46 +0100 |
commit | 00fe0f6cb4a736bbb5e633c567ddf7ac9a09ce69 (patch) | |
tree | 9ddf09dda84c65904c36dec759834ea446b4ac5d /app/helpers | |
parent | f5daa20f2a90098c9d689c5ec9d95ce9887b3a33 (diff) | |
parent | 8f97ffe91e79c0418666f64b5830d3e74fcc83ba (diff) |
Merge pull request #2136 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/application_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0605457e8..2cac2de59 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -112,7 +112,7 @@ module ApplicationHelper def fa_icon(icon, attributes = {}) class_names = attributes[:class]&.split(' ') || [] class_names << 'fa' - class_names += icon.split(' ').map { |cl| "fa-#{cl}" } + class_names += icon.split.map { |cl| "fa-#{cl}" } content_tag(:i, nil, attributes.merge(class: class_names.join(' '))) end @@ -164,7 +164,7 @@ module ApplicationHelper end def body_classes - output = (@body_classes || '').split(' ') + output = (@body_classes || '').split output << "flavour-#{current_flavour.parameterize}" output << "skin-#{current_skin.parameterize}" output << 'system-font' if current_account&.user&.setting_system_font_ui |