From a1f1ff5c9994c3a5458c4c7e5f06b54619a9a685 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Sat, 6 Jul 2024 20:52:02 +0900
Subject: [PATCH] Fix: Icons - Replace `edit` as acorn design system #935

---
 css/leptonChrome.css                     | 20 ++++++++++----------
 css/leptonChromeESR.css                  | 10 +++++-----
 css/leptonContent.css                    |  8 ++++----
 css/leptonContentESR.css                 |  4 ++--
 icons/edit-active.svg                    |  3 +++
 src/icons/_activity_stream.scss          |  2 +-
 src/icons/_global_menubar.scss           |  2 +-
 src/icons/context_menu/_others.scss      |  2 +-
 src/icons/context_menu/_place.scss       |  2 +-
 src/icons/context_menu/_tab_toolbar.scss |  2 +-
 src/icons/fork_browsers/_floorp.scss     |  2 +-
 11 files changed, 30 insertions(+), 27 deletions(-)
 create mode 100644 icons/edit-active.svg

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index dac3290c..3bb3aad5 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -12332,7 +12332,7 @@
         }
       }
       #tm-renameTab {
-        --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+        --menuitem-image: url("../icons/edit-active.svg");
       }
       #tm-copyTabUrl {
         --menuitem-image: url("../icons/link.svg");
@@ -12778,7 +12778,7 @@
       #placesContext_show_bookmark\:info,
       #placesContext_show\:info,
       #placesContext_show_folder\:info {
-        --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+        --menuitem-image: url("../icons/edit-active.svg");
       }
       #placesContext_deleteBookmark,
       #placesContext_deleteFolder,
@@ -12842,7 +12842,7 @@
         --menuitem-image: url("chrome://global/skin/icons/check.svg");
       }
       #blockedPopupOptions > menuitem[oncommand="gPopupBlockerObserver.editPopupSettings();"] {
-        --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+        --menuitem-image: url("../icons/edit-active.svg");
       }
       #blockedPopupDontShowMessage {
         /* checkbox */
@@ -13084,7 +13084,7 @@
         --menuitem-image: url("../icons/mail-inbox-all.svg");
       }
       #edit-menu {
-        --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+        --menuitem-image: url("../icons/edit-active.svg");
       }
       #view-menu {
         --menuitem-image: url("../icons/content-view.svg");
@@ -13562,7 +13562,7 @@
       --menuitem-image: url("chrome://global/skin/icons/reload.svg");
     }
     #usercssloader-submenupopup > menuitem[data-l10n-id="make-browsercss-file"] {
-      --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+      --menuitem-image: url("../icons/edit-active.svg");
     }
     #usercssloader-submenupopup > menuitem[data-l10n-id="open-css-folder"] {
       --menuitem-image: var(--uc-folder-icon);
@@ -27309,7 +27309,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #tm-renameTab {
-    --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+    --menuitem-image: url("../icons/edit-active.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -27994,7 +27994,7 @@
   #placesContext_show_bookmark\:info,
   #placesContext_show\:info,
   #placesContext_show_folder\:info {
-    --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+    --menuitem-image: url("../icons/edit-active.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -28094,7 +28094,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #blockedPopupOptions > menuitem[oncommand="gPopupBlockerObserver.editPopupSettings();"] {
-    --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+    --menuitem-image: url("../icons/edit-active.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -28426,7 +28426,7 @@
     --menuitem-image: url("../icons/mail-inbox-all.svg");
   }
   #edit-menu {
-    --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+    --menuitem-image: url("../icons/edit-active.svg");
   }
   #view-menu {
     --menuitem-image: url("../icons/content-view.svg");
@@ -29078,7 +29078,7 @@
     --menuitem-image: url("chrome://global/skin/icons/reload.svg");
   }
   #usercssloader-submenupopup > menuitem[data-l10n-id="make-browsercss-file"] {
-    --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+    --menuitem-image: url("../icons/edit-active.svg");
   }
   #usercssloader-submenupopup > menuitem[data-l10n-id="open-css-folder"] {
     --menuitem-image: var(--uc-folder-icon);
diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css
index 699c3e05..8b08ca50 100644
--- a/css/leptonChromeESR.css
+++ b/css/leptonChromeESR.css
@@ -12963,7 +12963,7 @@
         }
       }
       #tm-renameTab {
-        --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+        --menuitem-image: url("../icons/edit-active.svg");
       }
       #tm-copyTabUrl {
         --menuitem-image: url("../icons/link.svg");
@@ -13409,7 +13409,7 @@
       #placesContext_show_bookmark\:info,
       #placesContext_show\:info,
       #placesContext_show_folder\:info {
-        --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+        --menuitem-image: url("../icons/edit-active.svg");
       }
       #placesContext_deleteBookmark,
       #placesContext_deleteFolder,
@@ -13473,7 +13473,7 @@
         --menuitem-image: url("chrome://global/skin/icons/check.svg");
       }
       #blockedPopupOptions > menuitem[oncommand="gPopupBlockerObserver.editPopupSettings();"] {
-        --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+        --menuitem-image: url("../icons/edit-active.svg");
       }
       #blockedPopupDontShowMessage {
         /* checkbox */
@@ -13715,7 +13715,7 @@
         --menuitem-image: url("../icons/mail-inbox-all.svg");
       }
       #edit-menu {
-        --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+        --menuitem-image: url("../icons/edit-active.svg");
       }
       #view-menu {
         --menuitem-image: url("../icons/content-view.svg");
@@ -14193,7 +14193,7 @@
       --menuitem-image: url("chrome://global/skin/icons/reload.svg");
     }
     #usercssloader-submenupopup > menuitem[data-l10n-id="make-browsercss-file"] {
-      --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+      --menuitem-image: url("../icons/edit-active.svg");
     }
     #usercssloader-submenupopup > menuitem[data-l10n-id="open-css-folder"] {
       --menuitem-image: var(--uc-folder-icon);
diff --git a/css/leptonContent.css b/css/leptonContent.css
index 7e5a57a4..3529297b 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -321,7 +321,7 @@
       --menuitem-image: url("../icons/unpin-tab.svg");
     }
     .context-menu-item span[data-l10n-id="newtab-menu-edit-topsites"] {
-      --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+      --menuitem-image: url("../icons/edit-active.svg");
     }
     .context-menu-item span[data-l10n-id="newtab-menu-bookmark"] {
       --menuitem-image: url("chrome://browser/skin/bookmark.svg");
@@ -3493,7 +3493,7 @@
         #placesContext_show_bookmark\:info,
         #placesContext_show\:info,
         #placesContext_show_folder\:info {
-          --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+          --menuitem-image: url("../icons/edit-active.svg");
         }
         #placesContext_deleteBookmark,
         #placesContext_deleteFolder,
@@ -3993,7 +3993,7 @@
       --menuitem-image: url("../icons/unpin-tab.svg");
     }
     .context-menu-item span[data-l10n-id="newtab-menu-edit-topsites"] {
-      --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+      --menuitem-image: url("../icons/edit-active.svg");
     }
     .context-menu-item span[data-l10n-id="newtab-menu-bookmark"] {
       --menuitem-image: url("chrome://browser/skin/bookmark.svg");
@@ -7274,7 +7274,7 @@
       #placesContext_show_bookmark\:info,
       #placesContext_show\:info,
       #placesContext_show_folder\:info {
-        --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+        --menuitem-image: url("../icons/edit-active.svg");
       }
       #placesContext_deleteBookmark,
       #placesContext_deleteFolder,
diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css
index 40ab7f01..a4b16d6c 100644
--- a/css/leptonContentESR.css
+++ b/css/leptonContentESR.css
@@ -321,7 +321,7 @@
       --menuitem-image: url("../icons/unpin-tab.svg");
     }
     .context-menu-item span[data-l10n-id="newtab-menu-edit-topsites"] {
-      --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+      --menuitem-image: url("../icons/edit-active.svg");
     }
     .context-menu-item span[data-l10n-id="newtab-menu-bookmark"] {
       --menuitem-image: url("chrome://browser/skin/bookmark.svg");
@@ -3632,7 +3632,7 @@
         #placesContext_show_bookmark\:info,
         #placesContext_show\:info,
         #placesContext_show_folder\:info {
-          --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+          --menuitem-image: url("../icons/edit-active.svg");
         }
         #placesContext_deleteBookmark,
         #placesContext_deleteFolder,
diff --git a/icons/edit-active.svg b/icons/edit-active.svg
new file mode 100644
index 00000000..2a439224
--- /dev/null
+++ b/icons/edit-active.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5102 0.589672C11.2931 -0.193221 12.5579 -0.193221 13.3408 0.589672L15.4108 2.65967C16.1937 3.44257 16.1937 4.70744 15.4108 5.49033L5.12083 15.7803C4.98018 15.921 4.78941 16 4.5905 16H0.750501C0.336287 16 0.000500679 15.6642 0.000500679 15.25V11.41C0.000500679 11.2111 0.0795183 11.0203 0.220171 10.8797L10.5102 0.589672ZM12.2802 1.65033C12.0831 1.45323 11.7679 1.45323 11.5708 1.65033L10.2162 3.005L12.9955 5.78434L14.3502 4.42967C14.5473 4.23257 14.5473 3.91744 14.3502 3.72033L12.2802 1.65033ZM11.9348 6.845L4.27984 14.5H1.5005V11.7207L9.1555 4.06566L11.9348 6.845Z"/>
+</svg>
diff --git a/src/icons/_activity_stream.scss b/src/icons/_activity_stream.scss
index b916a3ec..bfc362b7 100644
--- a/src/icons/_activity_stream.scss
+++ b/src/icons/_activity_stream.scss
@@ -5,7 +5,7 @@
   --menuitem-image: url("../icons/unpin-tab.svg");
 }
 .context-menu-item span[data-l10n-id="newtab-menu-edit-topsites"] {
-  --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+  --menuitem-image: url("../icons/edit-active.svg");
 }
 .context-menu-item span[data-l10n-id="newtab-menu-bookmark"] {
   --menuitem-image: url("chrome://browser/skin/bookmark.svg");
diff --git a/src/icons/_global_menubar.scss b/src/icons/_global_menubar.scss
index e4773970..9801021e 100644
--- a/src/icons/_global_menubar.scss
+++ b/src/icons/_global_menubar.scss
@@ -3,7 +3,7 @@
   --menuitem-image: url("../icons/mail-inbox-all.svg");
 }
 #edit-menu {
-  --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+  --menuitem-image: url("../icons/edit-active.svg");
 }
 #view-menu {
   --menuitem-image: url("../icons/content-view.svg");
diff --git a/src/icons/context_menu/_others.scss b/src/icons/context_menu/_others.scss
index 98f40aeb..b156633a 100644
--- a/src/icons/context_menu/_others.scss
+++ b/src/icons/context_menu/_others.scss
@@ -15,7 +15,7 @@
   --menuitem-image: url("chrome://global/skin/icons/check.svg");
 }
 #blockedPopupOptions > menuitem[oncommand="gPopupBlockerObserver.editPopupSettings();"] {
-  --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+  --menuitem-image: url("../icons/edit-active.svg");
 }
 #blockedPopupDontShowMessage {
   /* checkbox */
diff --git a/src/icons/context_menu/_place.scss b/src/icons/context_menu/_place.scss
index ff23f51a..4764c72f 100644
--- a/src/icons/context_menu/_place.scss
+++ b/src/icons/context_menu/_place.scss
@@ -24,7 +24,7 @@
 #placesContext_show_bookmark\:info,
 #placesContext_show\:info,
 #placesContext_show_folder\:info {
-  --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+  --menuitem-image: url("../icons/edit-active.svg");
 }
 #placesContext_deleteBookmark,
 #placesContext_deleteFolder,
diff --git a/src/icons/context_menu/_tab_toolbar.scss b/src/icons/context_menu/_tab_toolbar.scss
index 2488d3b7..a3ec4f33 100644
--- a/src/icons/context_menu/_tab_toolbar.scss
+++ b/src/icons/context_menu/_tab_toolbar.scss
@@ -243,7 +243,7 @@ menuitem.viewCustomizeToolbar {
   }
 }
 #tm-renameTab {
-  --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+  --menuitem-image: url("../icons/edit-active.svg");
 }
 #tm-copyTabUrl {
   --menuitem-image: url("../icons/link.svg");
diff --git a/src/icons/fork_browsers/_floorp.scss b/src/icons/fork_browsers/_floorp.scss
index 67c39475..7947326a 100644
--- a/src/icons/fork_browsers/_floorp.scss
+++ b/src/icons/fork_browsers/_floorp.scss
@@ -47,7 +47,7 @@
     }
 
     &[data-l10n-id="make-browsercss-file"] {
-      --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+      --menuitem-image: url("../icons/edit-active.svg");
     }
     &[data-l10n-id="open-css-folder"] {
       --menuitem-image: var(--uc-folder-icon);