fix(ShortURL): class for link icon (#1640)

* fix(ShortURL): class for link icon
qiuwenbaike · Jan 7, 2025 · acd9e1b · acd9e1b
1 parent 6456d86
commit acd9e1b
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 29 deletions.
diff --git a/dist/ShortURL-pagestyles/ShortURL-pagestyles.css b/dist/ShortURL-pagestyles/ShortURL-pagestyles.css
diff --git a/dist/ShortURL/ShortURL.js b/dist/ShortURL/ShortURL.js
diff --git a/dist/definition.txt b/dist/definition.txt
@@ -47,7 +47,7 @@
 * ScrollUpButton[ResourceLoader|default|dependencies=ext.gadget.i18n,ext.gadget.React,ext.gadget.Tippy,ext.gadget.Util|peers=ScrollUpButton-pagestyles|requiresES6]|ScrollUpButton.js
 * ScrollUpButton-pagestyles[ResourceLoader|hidden|requiresES6]|ScrollUpButton-pagestyles.css
 * SearchShortcuts[ResourceLoader|dependencies=ext.gadget.Util|requiresES6]|SearchShortcuts.js
-* ShortURL[ResourceLoader|dependencies=ext.gadget.Clipboard,ext.gadget.i18n,ext.gadget.React,ext.gadget.Tippy,ext.gadget.Toastify,ext.gadget.Util,mediawiki.api,mediawiki.util,mediawiki.widgets,oojs-ui-windows|peers=ShortURL-pagestyles|requiresES6]|ShortURL.js
+* ShortURL[ResourceLoader|dependencies=ext.gadget.Clipboard,ext.gadget.i18n,ext.gadget.React,ext.gadget.Tippy,ext.gadget.Toastify,ext.gadget.Util,mediawiki.api,mediawiki.util,mediawiki.widgets,oojs-ui-windows,oojs-ui.styles.icons-editing-core|peers=ShortURL-pagestyles|requiresES6]|ShortURL.js
 * ShortURL-pagestyles[ResourceLoader|hidden|requiresES6]|ShortURL-pagestyles.css
 * SmoothTOC[ResourceLoader|default|dependencies=ext.gadget.Util|skins=gongbi,vector,vector-2022|requiresES6]|SmoothTOC.js
 * TextSpacing[ResourceLoader|dependencies=ext.gadget.Util|requiresES6]|TextSpacing.js|TextSpacing.css

diff --git a/src/ShortURL-pagestyles/ShortURL-pagestyles.less b/src/ShortURL-pagestyles/ShortURL-pagestyles.less
@@ -8,18 +8,6 @@
 	text-indent: -9999px;
 	user-select: none;
 
-	.skin-gongbi & {
-		vertical-align: sub;
-	}
-
-	.citizen-body-header--sticky &,
-	.ve-init-mw-desktopArticleTarget-originalContent & {
-		display: none;
-	}
-}
-
-.gadget-short-link__icon,
-.mw-ui-icon-wikimedia-shortlink {
 	&::before {
 		background-image: data-uri('./images/link.svg');
 		background-image: linear-gradient(transparent, transparent), data-uri('./images/link.svg');
@@ -32,4 +20,13 @@
 		content: '';
 		opacity: 0.6;
 	}
+
+	.skin-gongbi & {
+		vertical-align: sub;
+	}
+
+	.citizen-body-header--sticky &,
+	.ve-init-mw-desktopArticleTarget-originalContent & {
+		display: none;
+	}
 }
diff --git a/src/ShortURL/definition.json b/src/ShortURL/definition.json
@@ -13,7 +13,8 @@
 		"mediawiki.api",
 		"mediawiki.util",
 		"mediawiki.widgets",
-		"oojs-ui-windows"
+		"oojs-ui-windows",
+		"oojs-ui.styles.icons-editing-core"
 	],
 	"peers": ["ShortURL-pagestyles"]
 }
diff --git a/src/ShortURL/modules/addLink.tsx b/src/ShortURL/modules/addLink.tsx
@@ -83,10 +83,15 @@ const addLink = (link: string, permaLink: string): void => {
 		});
 
 		const isCitizen: boolean = skin === 'citizen';
-		if (isCitizen && !$(portletLink).find('.mw-ui-icon-wikimedia-shortlink').length) {
+		if (isCitizen && !$(portletLink).find('#mw-ui-icon-wikimedia-shortlink').length) {
 			$(portletLink)
 				.find('a')
-				.prepend(<span class="citizen-ui-icon mw-ui-icon-wikimedia-shortlink" />);
+				.prepend(
+					<span
+						id="mw-ui-icon-wikimedia-shortlink"
+						className={['citizen-ui-icon', 'mw-ui-icon-link', 'mw-ui-icon-wikimedia-link']}
+					/>
+				);
 		}
 	}