Move html_safe declaration for user_mailer from layout to helper

[rails.git] / config / initializers / sanitize.rb

diff --git a/config/initializers/sanitize.rb b/config/initializers/sanitize.rb
index a6cce19a96633437469f0345c07a350825345511..c9d6a5dbac75d48b693e7b1927c19b1c9a297f30 100644 (file)
--- a/config/initializers/sanitize.rb
+++ b/config/initializers/sanitize.rb
@@ -3,10 +3,22 @@ Sanitize::Config::OSM = Sanitize::Config.merge(
   :elements => Sanitize::Config::RELAXED[:elements] - %w[div style],
   :remove_contents => %w[script style],
   :transformers => lambda do |env|
+    style = env[:node]["style"] || ""
+
     env[:node].remove_class
-    env[:node].kwattr_remove("style", nil)
+    env[:node].remove_attribute("style")
+
     env[:node].add_class("table table-sm w-auto") if env[:node_name] == "table"
 
+    case style
+    when /\btext-align:\s+left\b/
+      env[:node].add_class("text-start")
+    when /\btext-align:\s+center\b/
+      env[:node].add_class("text-center")
+    when /\btext-align:\s+right\b/
+      env[:node].add_class("text-end")
+    end
+
     if env[:node_name] == "a"
       rel = env[:node]["rel"] || ""