From: Tom Hughes <tom@compton.nu>
Date: Wed, 8 May 2024 17:29:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4772'
X-Git-Tag: live~991
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/88ca76e6e8ca59fde38e2cb110176b43c55575ed?hp=d8b592ddb279b253663886d813792d3c2b48dd7f

Merge remote-tracking branch 'upstream/pull/4772'
---

diff --git a/Gemfile b/Gemfile
index 0181c5c68..5385e1217 100644
--- a/Gemfile
+++ b/Gemfile
@@ -131,7 +131,7 @@ gem "gd2-ffij", ">= 0.4.0"
 gem "marcel"
 
 # Used for browser detection
-gem "browser"
+gem "browser", "< 6" # for ruby 3.0 support
 
 # Used for S3 object storage
 gem "aws-sdk-s3"
diff --git a/Gemfile.lock b/Gemfile.lock
index 0b2ecf330..62a312dca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -136,7 +136,7 @@ GEM
     brakeman (6.1.2)
       racc
     brotli (0.5.0)
-    browser (6.0.0)
+    browser (5.3.1)
     builder (3.2.4)
     bzip2-ffi (1.1.1)
       ffi (~> 1.0)
@@ -336,8 +336,7 @@ GEM
       minitest (>= 4, < 6)
     msgpack (1.7.2)
     multi_json (1.15.0)
-    multi_xml (0.7.1)
-      bigdecimal (~> 3.1)
+    multi_xml (0.6.0)
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
@@ -613,7 +612,7 @@ DEPENDENCIES
   bootstrap (~> 5.3.2)
   bootstrap_form (~> 5.0)
   brakeman
-  browser
+  browser (< 6)
   bzip2-ffi
   cancancan
   canonical-rails
diff --git a/app/helpers/user_roles_helper.rb b/app/helpers/user_roles_helper.rb
index 4634cb015..e839c0ae6 100644
--- a/app/helpers/user_roles_helper.rb
+++ b/app/helpers/user_roles_helper.rb
@@ -24,7 +24,7 @@ module UserRolesHelper
   def role_icon_svg_tag(role, blank, title, **options)
     role_colors = {
       "administrator" => "#f69e42",
-      "moderator" => "#0606ff",
+      "moderator" => "#447eff",
       "importer" => "#38e13a"
     }
     color = role_colors[role] || "currentColor"
@@ -32,8 +32,11 @@ module UserRolesHelper
     path_data = "M 10,2 8.125,8 2,8 6.96875,11.71875 5,18 10,14 15,18 13.03125,11.71875 18,8 11.875,8 10,2 z"
     tag.svg(:width => 20, :height => 20, **options) do
       concat tag.title(title)
-      concat tag.path(:d => path_data, :fill => color, :stroke => color, "stroke-width" => 2, "stroke-linejoin" => "round")
-      concat tag.path(:d => path_data, :fill => "#fff") if blank
+      concat tag.path(:d => path_data,
+                      :fill => blank ? "none" : color,
+                      :stroke => color,
+                      "stroke-width" => blank ? 1.5 : 2,
+                      "stroke-linejoin" => "round")
     end
   end
 end