From 6c9be61f572f79cfe6ceb0599a05c1dcdf8d490c Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 26 Aug 2018 14:29:58 +0200 Subject: [PATCH 1/2] Fix regression from #8439 (#8455) Missing no-reduce-motion/reduce-motion body class --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9eb042938..758f864d7 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -77,7 +77,7 @@ module ApplicationHelper 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' + output << (current_account&.user&.setting_reduce_motion ? 'reduce-motion' : 'no-reduce-motion') output << 'rtl' if locale_direction == 'rtl' output.reject(&:blank?).join(' ') end From 104d089df16214855cf3860671f022f7d2520a51 Mon Sep 17 00:00:00 2001 From: Tad Thorley Date: Sun, 26 Aug 2018 06:33:59 -0600 Subject: [PATCH 2/2] Update _bio.html.haml (#8449) On my local instance (https://ruby.social) we have a custom emoji for octocat (:octocat:). I would love to be able to use the emoji in the metadata for my profile. Instead of: | github | https://github.com/phaedryx It could be: | :octocat: | https://github.com/phaedryx (using a single emoji makes it easier to read the urls) --- app/views/accounts/_bio.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/accounts/_bio.html.haml b/app/views/accounts/_bio.html.haml index c9a4d8f1b..4e674beff 100644 --- a/app/views/accounts/_bio.html.haml +++ b/app/views/accounts/_bio.html.haml @@ -3,7 +3,7 @@ .account__header__fields - account.fields.each do |field| %dl - %dt.emojify{ title: field.name }= field.name + %dt.emojify{ title: field.name }= Formatter.instance.format_field(account, field.name, custom_emojify: true) %dd.emojify{ title: field.value }= Formatter.instance.format_field(account, field.value, custom_emojify: true) = account_badge(account)