From a6d650d3e0094c9d70ce6ca98f0830a9ae0e8a53 Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Mon, 21 Jul 2025 14:46:45 +0300
Subject: [PATCH] Restore Bootstrap "chat" icons for changeset comments

https://icons.getbootstrap.com/icons/chat/
https://icons.getbootstrap.com/icons/chat-fill/

Undoes a part of 5e8576462633a9dacb00c580159fc62bf890ea31 that complicates comments icon logic by introducing a fill transform. The transform doesn't produce the same result if when opacity is less than 1, and it is less than 1. This happens because fill and stroke areas overlap.
---
 app/assets/images/icons/chat-fill.svg         | 3 +++
 app/assets/images/icons/chat.svg              | 3 +++
 app/assets/images/icons/comment.svg           | 3 ---
 app/views/changesets/_changeset_line.html.erb | 2 +-
 config/initializers/inline_svg.rb             | 9 ---------
 5 files changed, 7 insertions(+), 13 deletions(-)
 create mode 100644 app/assets/images/icons/chat-fill.svg
 create mode 100644 app/assets/images/icons/chat.svg
 delete mode 100644 app/assets/images/icons/comment.svg

diff --git a/app/assets/images/icons/chat-fill.svg b/app/assets/images/icons/chat-fill.svg
new file mode 100644
index 000000000..266c84487
--- /dev/null
+++ b/app/assets/images/icons/chat-fill.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
+  <path d="M8 15c4.418 0 8-3.134 8-7s-3.582-7-8-7-8 3.134-8 7c0 1.76.743 3.37 1.97 4.6-.097 1.016-.417 2.13-.771 2.966-.079.186.074.394.273.362 2.256-.37 3.597-.938 4.18-1.234A9 9 0 0 0 8 15"/>
+</svg>
diff --git a/app/assets/images/icons/chat.svg b/app/assets/images/icons/chat.svg
new file mode 100644
index 000000000..c6c04efc1
--- /dev/null
+++ b/app/assets/images/icons/chat.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
+  <path d="M2.678 11.894a1 1 0 0 1 .287.801 11 11 0 0 1-.398 2c1.395-.323 2.247-.697 2.634-.893a1 1 0 0 1 .71-.074A8 8 0 0 0 8 14c3.996 0 7-2.807 7-6s-3.004-6-7-6-7 2.808-7 6c0 1.468.617 2.83 1.678 3.894m-.493 3.905a22 22 0 0 1-.713.129c-.2.032-.352-.176-.273-.362a10 10 0 0 0 .244-.637l.003-.01c.248-.72.45-1.548.524-2.319C.743 11.37 0 9.76 0 8c0-3.866 3.582-7 8-7s8 3.134 8 7-3.582 7-8 7a9 9 0 0 1-2.347-.306c-.52.263-1.639.742-3.468 1.105"/>
+</svg>
diff --git a/app/assets/images/icons/comment.svg b/app/assets/images/icons/comment.svg
deleted file mode 100644
index 283e2f514..000000000
--- a/app/assets/images/icons/comment.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 16 16" stroke="currentColor">
-  <path stroke-linejoin="round" d="M5.6 14.16c-.82.4-1.54.77-3.78 1.2.37-1 .57-1.88.67-2.95A7.5 6.5 0 0 1 .5 8 7.5 6.5 0 1 1 8 14.5a7.5 6.5 0 0 1-2.4-.34Z" />
-</svg>
diff --git a/app/views/changesets/_changeset_line.html.erb b/app/views/changesets/_changeset_line.html.erb
index e8e23ba00..1f03a0aa0 100644
--- a/app/views/changesets/_changeset_line.html.erb
+++ b/app/views/changesets/_changeset_line.html.erb
@@ -38,7 +38,7 @@
     <%= tag.span :class => ["changeset_num_comments d-flex align-items-baseline gap-1 justify-content-end", { "opacity-50" => num_comments.zero? }],
                  :title => t(".comments", :count => num_comments) do %>
       <%= num_comments %>
-      <%= inline_svg_tag "icons/comment.svg", :fill => num_comments.zero? ? "none" : "currentColor" %>
+      <%= inline_svg_tag num_comments.zero? ? "icons/chat.svg" : "icons/chat-fill.svg", :size => "12px" %>
     <% end %>
   <% end %>
 </div>
diff --git a/config/initializers/inline_svg.rb b/config/initializers/inline_svg.rb
index a0878e458..9a117b13e 100644
--- a/config/initializers/inline_svg.rb
+++ b/config/initializers/inline_svg.rb
@@ -6,17 +6,8 @@ module OpenStreetMap
       end
     end
   end
-
-  class SvgFillOverrideTransform < InlineSvg::CustomTransformation
-    def transform(doc)
-      with_svg(doc) do |svg|
-        svg.set_attribute("fill", value)
-      end
-    end
-  end
 end
 
 InlineSvg.configure do |config|
   config.add_custom_transformation(:attribute => :to_symbol, :transform => OpenStreetMap::SvgToSymbolTransform)
-  config.add_custom_transformation(:attribute => :fill, :transform => OpenStreetMap::SvgFillOverrideTransform)
 end
-- 
2.39.5