post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Merge remote-tracking branch 'parent/main' into kb_migration

Browse source
This commit is contained in:
KMY 2023-03-18 13:30:34 +09:00
commit 7a4dc84202
286 changed files with 7203 additions and 2880 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/application_helper.rb
View file

@ -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
@ -166,7 +166,7 @@ module ApplicationHelper
end
def body_classes
output = (@body_classes || '').split(' ')
output = (@body_classes || '').split
output << "theme-#{current_theme.parameterize}"
output << 'system-font' if current_account&.user&.setting_system_font_ui
output << (current_account&.user&.setting_reduce_motion ? 'reduce-motion' : 'no-reduce-motion')

4
app/helpers/languages_helper.rb
View file

@ -1,6 +1,6 @@
# frozen_string_literal: true
# rubocop:disable Metrics/ModuleLength, Style/WordArray
# rubocop:disable Metrics/ModuleLength
module LanguagesHelper
ISO_639_1 = {
@ -275,4 +275,4 @@ module LanguagesHelper
end
end
# rubocop:enable Metrics/ModuleLength, Style/WordArray
# rubocop:enable Metrics/ModuleLength