From a81bf1fc166d1ce0c7fd057169b31051cb29e9eb Mon Sep 17 00:00:00 2001
From: alistair3149 <alistair31494322@gmail.com>
Date: Mon, 6 May 2024 13:37:33 -0400
Subject: [PATCH] =?UTF-8?q?refactor(core):=20=E2=99=BB=EF=B8=8F=20re-imple?=
 =?UTF-8?q?ment=20VE=20action=20icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/Hooks/SkinHooks.php                        |  5 +----
 .../skins.citizen.styles/components/Pagetools.less  | 13 -------------
 skin.json                                           |  8 ++++++--
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/includes/Hooks/SkinHooks.php b/includes/Hooks/SkinHooks.php
index 155dcdcd..0591c647 100644
--- a/includes/Hooks/SkinHooks.php
+++ b/includes/Hooks/SkinHooks.php
@@ -417,10 +417,7 @@ class SkinHooks implements
 			'edit' => 'edit',
 			'view-foreign' => 'linkExternal',
 			// Extension:VisualEditor
-			// For some reason the icon span element keeps getting removed
-			// So we are adding this the legacy way
-			// Bug: T323188
-			// 've-edit' => 'edit',
+			've-edit' => 'edit',
 			// Extension:DiscussionTools
 			'addsection' => 'speechBubbleAdd'
 		];
diff --git a/resources/skins.citizen.styles/components/Pagetools.less b/resources/skins.citizen.styles/components/Pagetools.less
index a5bf5dc4..a828a492 100644
--- a/resources/skins.citizen.styles/components/Pagetools.less
+++ b/resources/skins.citizen.styles/components/Pagetools.less
@@ -171,7 +171,6 @@
 		}
 	}
 
-	> a,
 	.citizen-ui-icon {
 		&::before {
 			filter: invert( 1 );
@@ -184,18 +183,6 @@
 // VE styles shouldn't be core but it is just a few lines :/
 #ca-ve-edit {
 	order: 98; // Before source edit
-
-	> a {
-		// See SkinHooks.php for why VE is here
-		&::before {
-			width: var( --size-icon );
-			height: var( --size-icon );
-			content: '';
-			background-repeat: no-repeat;
-			background-position: center;
-			background-size: var( --size-icon );
-		}
-	}
 }
 
 #ca-edit {
diff --git a/skin.json b/skin.json
index d00c19cc..7f6fc94c 100644
--- a/skin.json
+++ b/skin.json
@@ -19,6 +19,11 @@
 			"Disabled": [
 				"citizen"
 			]
+		},
+		"VisualEditor": {
+			"IconSkins": [
+				"citizen"
+			]
 		}
 	},
 	"ValidSkinNames": {
@@ -277,8 +282,7 @@
 			"selector": "{name}",
 			"defaultColor": "#000",
 			"images": {
-				".citizen-toc__top:before": "resources/skins.citizen.icons/backToTop.svg",
-				"#ca-ve-edit > a:before": "resources/skins.citizen.icons/wmui/edit.svg"
+				".citizen-toc__top:before": "resources/skins.citizen.icons/backToTop.svg"
 			}
 		},
 		"skins.citizen.icons.wmui": {