From c4c7ddd15aab2de6558b7bc8dfcf8c821ab90a7b Mon Sep 17 00:00:00 2001
From: Alexander Meindl <a.meindl@alphanodes.com>
Date: Wed, 13 Nov 2024 11:37:04 +0100
Subject: [PATCH] use svg css class of redmine 6 and drop a-svg class

---
 app/helpers/additionals_icons_helper.rb      |  2 +-
 assets/stylesheets/additionals.css           | 63 ++++++--------------
 test/unit/wiki_formating/common_mark_test.rb |  2 +-
 test/unit/wiki_formating/textile_test.rb     |  4 +-
 4 files changed, 23 insertions(+), 48 deletions(-)

diff --git a/app/helpers/additionals_icons_helper.rb b/app/helpers/additionals_icons_helper.rb
index 09b24943..bc23f561 100644
--- a/app/helpers/additionals_icons_helper.rb
+++ b/app/helpers/additionals_icons_helper.rb
@@ -49,7 +49,7 @@ def additionals_asset_path(file)
   def additionals_svg_sprite_icon(icon_name, size: DEFAULT_ICON_SIZE, sprite: 'icons', css_class: nil, title: nil)
     sprite_path = "#{sprite}.svg"
     title = l title if title.is_a? Symbol
-    css_classes = "a-s#{size} a-svg-icon"
+    css_classes = "s#{size} svg-icon"
     css_classes += " #{css_class}" if css_class
 
     content_tag(
diff --git a/assets/stylesheets/additionals.css b/assets/stylesheets/additionals.css
index 5f8a5999..fb4273fa 100644
--- a/assets/stylesheets/additionals.css
+++ b/assets/stylesheets/additionals.css
@@ -55,7 +55,7 @@ em.info a.external {
 }
 
 .a-icon.icon-padding,
-.a-svg-icon.icon-padding {
+.svg-icon.icon-padding {
   padding-right: 2px;
 }
 
@@ -79,56 +79,31 @@ h3.a-icon-label {
   margin-left: 4px;
 }
 
-svg.a-icon-svg {
-  stroke: #169;
-  fill: none;
-  stroke-width: 1.5;
-  vertical-align: middle;
-}
-
-svg.a-svg-icon.smiley {
+svg.svg-icon.smiley {
   fill: #edae40;
   stroke-width: 2;
 }
 
-svg.a-s64 {
-  width: 64px;
-  height: 64px;
-}
-
-svg.a-s32 {
-  width: 32px;
-  height: 32px;
-}
-
-svg.a-s24 {
-  width: 1.5rem;
-  height: 1.5rem;
-}
-
-svg.a-s20 {
-  width: 1.25rem;
-  height: 1.25rem;
-}
-
-svg.a-s18 {
-  width: 1.125rem;
-  height: 1.125rem;
-}
+svg {
+  &.s64 {
+    width: 64px;
+    height: 64px;
+  }
 
-svg.a-s16 {
-  width: 1rem;
-  height: 1rem;
-}
+  &.s32 {
+    width: 32px;
+    height: 32px;
+  }
 
-svg.a-s14 {
-  width: 0.875rem;
-  height: 0.875rem;
-}
+  &.s24 {
+    width: 1.5rem;
+    height: 1.5rem;
+  }
 
-svg.a-s12 {
-  width: 0.75rem;
-  height: 0.75rem;
+  &.s16 {
+    width: 1rem;
+    height: 1rem;
+  }
 }
 
 .sudo-admin { color: #d80000; }
diff --git a/test/unit/wiki_formating/common_mark_test.rb b/test/unit/wiki_formating/common_mark_test.rb
index 6c132ccd..f3cbf35f 100644
--- a/test/unit/wiki_formating/common_mark_test.rb
+++ b/test/unit/wiki_formating/common_mark_test.rb
@@ -14,7 +14,7 @@ def test_smileys
       with_plugin_settings 'additionals', legacy_smiley_support: 1,
                                           emoji_support: 0 do
         assert_includes smiley_filter('A small test :) with an smiley'), '#icon--smiley-smiley'
-        assert_includes smiley_filter('A small test :) with an smiley'), 'a-s18 a-svg-icon smiley'
+        assert_includes smiley_filter('A small test :) with an smiley'), 's18 svg-icon smiley'
       end
     end
 
diff --git a/test/unit/wiki_formating/textile_test.rb b/test/unit/wiki_formating/textile_test.rb
index 0348cd44..9cd0cd65 100644
--- a/test/unit/wiki_formating/textile_test.rb
+++ b/test/unit/wiki_formating/textile_test.rb
@@ -18,8 +18,8 @@ def test_smileys
         # this is required, because inline_smileys are activated with controller action
         @formatter::RULES << :inline_smileys
 
-        @to_test['A test with a :) smiley'] = ['#icon--smiley-smiley', 'a-s18 a-svg-icon smiley']
-        @to_test[':) :)'] = ['#icon--smiley-smiley', 'a-s18 a-svg-icon smiley']
+        @to_test['A test with a :) smiley'] = ['#icon--smiley-smiley', 's18 svg-icon smiley']
+        @to_test[':) :)'] = ['#icon--smiley-smiley', 's18 svg-icon smiley']
 
         assert_html_output @to_test
       end