Convert legacy icons

diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index 2237244bc5bc860f36106b998efa30b6c299a313..8a3eb375e79f653041805376f852fd2984690917 100644 (file)
--- 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 6af9540a33c36cb0dbecb8c98e368646515d45b9..e969ddcd2beea1371ba667b29241de077aef1301 100644 (file)
--- 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 8dc6e8ba35d4e2c04df4aea2a8bb943469c16b5f..4b97dfa18241cab9c6dce711f3907eef7b6a979f 100644 (file)
--- 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 03f7cb35c83a0a6ca0705dd4b1e1ab0ef520a533..864e1d0af3481ca2708115a870ad514b48d092ad 100644 (file)
--- 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 c6be36fbb7fd4f960db589de5506364e3dd6a808..f78ea36f7dd409500afee386fd3e3613d03596e0 100644 (file)
--- 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 929fd6d56106f0db1d1fadff033cde879556ea07..59db9e3fc473ad7d7e6b62162dbd0d4bb66770de 100644 (file)
--- 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 6af9540a33c36cb0dbecb8c98e368646515d45b9..a3793ace71d67a8642520a8c300d3230fa895a6d 100644 (file)
--- 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 6bccab96f2252cc0a7446673d2055c693968743d..5d5bddf7e0eeb50bb6d345cd5624dd10e1886100 100644 (file)
--- 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 929fd6d56106f0db1d1fadff033cde879556ea07..59db9e3fc473ad7d7e6b62162dbd0d4bb66770de 100644 (file)
--- 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 2f9739b9b8c19d1ba5df9b361c5df1a74a6dd4e7..4a40e8d676ae34bb217630046d1f97f512d35195 100644 (file)
--- 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;
 }