From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 20 Aug 2022 17:48:27 +0000 (+0200)
Subject: Convert legacy icons
X-Git-Tag: 6.0.0_Alpha_1~1024^2~2^2~28
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3ff6ced9e876f1c4fa833bbe984fd4c8caf5c647;p=GitHub%2FWoltLab%2FWCF.git

Convert legacy icons
---

diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index 2237244bc5..8a3eb375e7 100644
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -1761,7 +1761,7 @@
 		<type>
 			<name>com.woltlab.wcf.multifactor.backup</name>
 			<definitionname>com.woltlab.wcf.multifactor</definitionname>
-			<icon>sticky-note</icon>
+			<icon>note-sticky</icon>
 			<priority>1</priority>
 			<classname>wcf\system\user\multifactor\BackupMultifactorMethod</classname>
 		</type>
diff --git a/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl b/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl
index 6af9540a33..e969ddcd2b 100644
--- a/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl
+++ b/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl
@@ -13,7 +13,7 @@
 			{if $attachment->tinyThumbnailType}
 				<img src="{$attachment->getThumbnailLink('tiny')}" alt="" class="attachmentTinyThumbnail">
 			{else}
-				<span class="icon icon64 fa-{@$attachment->getIconName()}"></span>
+				{icon size=64 name=$attachment->getIconName()}
 			{/if}
 			
 			<div>
diff --git a/com.woltlab.wcf/templates/accountSecurity.tpl b/com.woltlab.wcf/templates/accountSecurity.tpl
index 8dc6e8ba35..4b97dfa182 100644
--- a/com.woltlab.wcf/templates/accountSecurity.tpl
+++ b/com.woltlab.wcf/templates/accountSecurity.tpl
@@ -12,8 +12,12 @@
 		{foreach from=$multifactorMethods item=method}
 			{if $method->objectType !== 'com.woltlab.wcf.multifactor.backup' || $enabledMultifactorMethods[$method->objectTypeID]|isset}
 				<li class="box64">
-					<div>
-						<span class="icon icon64 fa-{if $method->icon}{$method->icon}{else}lock{/if} accountSecurityInformationIcon"></span>
+					<div class="accountSecurityInformationIcon">
+						{if $method->icon}
+							{icon size=64 name=$method->icon}
+						{else}
+							{icon size=64 name='lock'}
+						{/if}
 					</div>
 					
 					<div class="accountSecurityContainer">
@@ -71,7 +75,7 @@
 		{foreach from=$activeSessions item=session}
 			<li class="box64 sessionItem">
 				<div>
-					<span class="icon icon64 fa-{$session->getUserAgent()->getDeviceIcon()}"></span>
+					{icon size=64 name=$session->getUserAgent()->getDeviceIcon()}
 				</div>
 				
 				<div class="accountSecurityContainer">
diff --git a/com.woltlab.wcf/templates/attachments.tpl b/com.woltlab.wcf/templates/attachments.tpl
index 03f7cb35c8..864e1d0af3 100644
--- a/com.woltlab.wcf/templates/attachments.tpl
+++ b/com.woltlab.wcf/templates/attachments.tpl
@@ -74,8 +74,12 @@
 						{if $attachment->showAsFile() && !$attachment->isEmbedded()}
 							<a href="{$attachment->getLink()}" class="messageAttachment jsTooltip" title="{lang}wcf.attachment.file.title{/lang}">
 								<span class="messageAttachmentIcon">
-									<span class="messageAttachmentIconDefault icon icon32 fa-{@$attachment->getIconName()}"></span>
-									<span class="messageAttachmentIconDownload icon icon32 fa-download"></span>
+									<span class="messageAttachmentIconDefault">
+										{icon size=32 name=$attachment->getIconName()}
+									</span>
+									<span class="messageAttachmentIconDownload">
+										{icon size=32 name='download'}
+									</span>
 								</span>
 								<span class="messageAttachmentFilename">{$attachment->filename}</span>
 								<span class="messageAttachmentMeta">{lang}wcf.attachment.file.info{/lang}</span>
diff --git a/com.woltlab.wcf/templates/messageFormAttachments.tpl b/com.woltlab.wcf/templates/messageFormAttachments.tpl
index c6be36fbb7..f78ea36f7d 100644
--- a/com.woltlab.wcf/templates/messageFormAttachments.tpl
+++ b/com.woltlab.wcf/templates/messageFormAttachments.tpl
@@ -5,7 +5,7 @@
 				{if $attachment->tinyThumbnailType}
 					<img src="{$attachment->getThumbnailLink('tiny')}" alt="" class="attachmentTinyThumbnail">
 				{else}
-					<span class="icon icon64 fa-{@$attachment->getIconName()}"></span>
+					{icon size=64 name=$attachment->getIconName()}
 				{/if}
 				
 				<div>
diff --git a/com.woltlab.wcf/templates/uploadFieldComponent.tpl b/com.woltlab.wcf/templates/uploadFieldComponent.tpl
index 929fd6d561..59db9e3fc4 100644
--- a/com.woltlab.wcf/templates/uploadFieldComponent.tpl
+++ b/com.woltlab.wcf/templates/uploadFieldComponent.tpl
@@ -17,7 +17,7 @@
 							<img src="{$file->getImage()}" width="{$file->getWidth()}" height="{$file->getHeight()}" loading="lazy" alt="" class="formUploadHandlerContentListImage">
 						</a>
 					{else}
-						<span class="icon icon64 fa-{$file->getIconName()}"></span>
+						{icon size=64 name=$file->getIconName()}
 					{/if}
 					
 					<div>
diff --git a/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl b/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl
index 6af9540a33..a3793ace71 100644
--- a/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl
@@ -13,7 +13,7 @@
 			{if $attachment->tinyThumbnailType}
 				<img src="{$attachment->getThumbnailLink('tiny')}" alt="" class="attachmentTinyThumbnail">
 			{else}
-				<span class="icon icon64 fa-{@$attachment->getIconName()}"></span>
+				{icon size=64 name=$attachment->getIconName()}
 			{/if}
 			
 			<div>
@@ -23,14 +23,14 @@
 				</div>
 				
 				<ul class="buttonGroup">
-					<li><span class="button small jsObjectAction" data-object-action="delete" data-confirm-message="{lang}wcf.attachment.delete.sure{/lang}">{lang}wcf.global.button.delete{/lang}</span></li>
+					<li><button type="button" class="button small jsObjectAction" data-object-action="delete" data-confirm-message="{lang}wcf.attachment.delete.sure{/lang}">{lang}wcf.global.button.delete{/lang}</button></li>
 					{if $attachment->isImage}
 						{if $attachment->thumbnailType}
-							<li><span class="button small jsButtonAttachmentInsertThumbnail" data-object-id="{@$attachment->attachmentID}" data-url="{$attachment->getThumbnailLink('thumbnail')}">{lang}wcf.attachment.insertThumbnail{/lang}</span></li>
+							<li><button type="button" class="button small jsButtonAttachmentInsertThumbnail" data-object-id="{@$attachment->attachmentID}" data-url="{$attachment->getThumbnailLink('thumbnail')}">{lang}wcf.attachment.insertThumbnail{/lang}</button></li>
 						{/if}
-						<li><span class="button small jsButtonAttachmentInsertFull" data-object-id="{@$attachment->attachmentID}" data-url="{$attachment->getLink()}">{lang}wcf.attachment.insertFull{/lang}</span></li>
+						<li><button type="button" class="button small jsButtonAttachmentInsertFull" data-object-id="{@$attachment->attachmentID}" data-url="{$attachment->getLink()}">{lang}wcf.attachment.insertFull{/lang}</button></li>
 					{else}
-						<li><span class="button small jsButtonInsertAttachment" data-object-id="{@$attachment->attachmentID}">{lang}wcf.attachment.insert{/lang}</span></li>
+						<li><button type="button" class="button small jsButtonInsertAttachment" data-object-id="{@$attachment->attachmentID}">{lang}wcf.attachment.insert{/lang}</button></li>
 					{/if}
 				</ul>
 			</div>
diff --git a/wcfsetup/install/files/acp/templates/attachmentList.tpl b/wcfsetup/install/files/acp/templates/attachmentList.tpl
index 6bccab96f2..5d5bddf7e0 100644
--- a/wcfsetup/install/files/acp/templates/attachmentList.tpl
+++ b/wcfsetup/install/files/acp/templates/attachmentList.tpl
@@ -110,7 +110,7 @@
 									{if $attachment->tinyThumbnailType}
 										<img src="{$attachment->getThumbnailLink('tiny')}" class="attachmentTinyThumbnail" alt="">
 									{else}
-										<span class="icon icon64 fa-{@$attachment->getIconName()}"></span>
+										{icon size=64 name=$attachment->getIconName()}
 									{/if}
 								</a>
 								
diff --git a/wcfsetup/install/files/acp/templates/uploadFieldComponent.tpl b/wcfsetup/install/files/acp/templates/uploadFieldComponent.tpl
index 929fd6d561..59db9e3fc4 100644
--- a/wcfsetup/install/files/acp/templates/uploadFieldComponent.tpl
+++ b/wcfsetup/install/files/acp/templates/uploadFieldComponent.tpl
@@ -17,7 +17,7 @@
 							<img src="{$file->getImage()}" width="{$file->getWidth()}" height="{$file->getHeight()}" loading="lazy" alt="" class="formUploadHandlerContentListImage">
 						</a>
 					{else}
-						<span class="icon icon64 fa-{$file->getIconName()}"></span>
+						{icon size=64 name=$file->getIconName()}
 					{/if}
 					
 					<div>
diff --git a/wcfsetup/install/files/style/ui/accountSecurity.scss b/wcfsetup/install/files/style/ui/accountSecurity.scss
index 2f9739b9b8..4a40e8d676 100644
--- a/wcfsetup/install/files/style/ui/accountSecurity.scss
+++ b/wcfsetup/install/files/style/ui/accountSecurity.scss
@@ -8,11 +8,6 @@
 	}
 }
 
-/* The smartphone icon is noticbly smaller than all other icons being used. */
-.accountSecurityInformationIcon.fa-mobile {
-	font-size: 70px;
-}
-
 .accountSecurityInformation {
 	flex: 1 auto;
 }