Omit the explicit size for the default icon size of 16

diff --git a/templates/__userInformationStartConversation.tpl b/templates/__userInformationStartConversation.tpl
index 0641e1a033907e61fdaf64962fb4831c2736b409..6d1ef1fd455b3eb6f7b9712e881de79a85a5a768 100644 (file)
--- a/templates/__userInformationStartConversation.tpl
+++ b/templates/__userInformationStartConversation.tpl
@@ -1,7 +1,7 @@
 {if MODULE_CONVERSATION && $__wcf->user->userID && $__wcf->session->getPermission('user.conversation.canUseConversation') && $__wcf->session->getPermission('user.conversation.canStartConversation') && $user->userID != $__wcf->user->userID}
        <li>
                <a class="jsTooltip" href="{link controller='ConversationAdd'}userID={@$user->userID}{/link}" title="{lang}wcf.conversation.button.add{/lang}">
-                       {icon size=16 name='comments' type='solid'}
+                       {icon name='comments' type='solid'}
                        <span class="invisible">{lang}wcf.conversation.button.add{/lang}</span>
                </a>
        </li>

diff --git a/templates/conversation.tpl b/templates/conversation.tpl
index 26cbb7e58a95e5e5cc47f35ad71b1936978895ba..d476cd7bf64b542d916800b20ad57d98c07497fc 100644 (file)
--- a/templates/conversation.tpl
+++ b/templates/conversation.tpl
@@ -12,7 +12,7 @@
                        <ul class="inlineList contentHeaderMetaData">
                                {hascontent}
                                        <li>
-                                               {icon size=16 name='tags'}
+                                               {icon name='tags'}
                                                <ul class="labelList">
                                                        {content}
                                                                {foreach from=$conversation->getAssignedLabels() item=label}
@@ -24,19 +24,19 @@
                                {/hascontent}
                                
                                <li>
-                                       {icon size=16 name='user'}
+                                       {icon name='user'}
                                        {user object=$conversation->getUserProfile()}
                                </li>
                                
                                <li>
-                                       {icon size=16 name='clock'}
+                                       {icon name='clock'}
                                        <a href="{$conversation->getLink()}">{@$conversation->time|time}</a>
                                </li>
                                
                                {if $conversation->isClosed}
                                        <li>
                                                <span class="jsIconLock">
-                                                       {icon size=16 name='lock'}
+                                                       {icon name='lock'}
                                                </span>
                                                {lang}wcf.global.state.closed{/lang}
                                        </li>
@@ -51,7 +51,7 @@
                                                {if $conversation->canReply()}
                                                        <li class="jsOnly">
                                                                <button class="button buttonPrimary jsQuickReply">
-                                                                       {icon size=16 name='reply'}
+                                                                       {icon name='reply'}
                                                                        <span>{lang}wcf.conversation.message.button.add{/lang}</span>
                                                                </button>
                                                        </li>
@@ -72,12 +72,12 @@
        <div class="conversation jsConversationInlineEditorContainer contentInteractionButton" data-conversation-id="{@$conversation->conversationID}" data-label-ids="[ {implode from=$conversation->getAssignedLabels() item=label}{@$label->labelID}{/implode} ]" data-is-closed="{@$conversation->isClosed}" data-can-close-conversation="{if $conversation->userID == $__wcf->getUser()->userID}1{else}0{/if}" data-can-add-participants="{if $conversation->canAddParticipants()}1{else}0{/if}" data-is-draft="{if $conversation->isDraft}1{else}0{/if}">
                {if $conversation->isDraft}
                        <a href="{link controller='ConversationDraftEdit' id=$conversation->conversationID}{/link}" class="button small jsConversationInlineEditor">
-                               {icon size=16 name='pencil'}
+                               {icon name='pencil'}
                                <span>{lang}wcf.global.button.edit{/lang}</span>
                        </a>
                {else}
                        <button class="button small jsConversationInlineEditor">
-                               {icon size=16 name='pencil'}
+                               {icon name='pencil'}
                                <span>{lang}wcf.global.button.edit{/lang}</span>
                        </button>
                {/if}
@@ -107,7 +107,7 @@
                                                                                data-confirm-message="{lang __encode=true}wcf.conversation.participants.removeParticipant.confirmMessage{/lang}"
                                                                                data-object-action-parameter-user-id="{@$participant->getObjectID()}"
                                                                        >
-                                                                               {icon size=16 name='xmark'}
+                                                                               {icon name='xmark'}
                                                                        </button>
                                                                {/if}
                                                        </p>

diff --git a/templates/conversationList.tpl b/templates/conversationList.tpl
index aae0c47337d2b67228895e9b6799e4416047b26d..50631791477bea8b9abd0e1d7be067e9001383eb 100644 (file)
--- a/templates/conversationList.tpl
+++ b/templates/conversationList.tpl
@@ -13,7 +13,7 @@
                                                {if $__wcf->session->getPermission('user.conversation.canStartConversation')}
                                                        <li>
                                                                <a href="{link controller='ConversationAdd'}{/link}" title="{lang}wcf.conversation.add{/lang}" class="button buttonPrimary">
-                                                                       {icon size=16 name='plus'}
+                                                                       {icon name='plus'}
                                                                        <span>{lang}wcf.conversation.button.add{/lang}</span>
                                                                </a>
                                                        </li>
@@ -136,7 +136,7 @@
 
 {capture assign='contentInteractionButtons'}
        <button class="markAllAsReadButton contentInteractionButton button small jsOnly">
-               {icon size=16 name='check'}
+               {icon name='check'}
                <span>{lang}wcf.global.button.markAllAsRead{/lang}</span>
        </button>
 {/capture}
@@ -162,11 +162,11 @@
                                                                <a rel="nofollow" href="{link controller='ConversationList'}{if $filter}filter={@$filter}&{/if}{if !$participants|empty}participants={implode from=$participants item=participant}{$participant|rawurlencode}{/implode}&{/if}pageNo={@$pageNo}&sortField={$sortField}&sortOrder={if $sortOrder == 'ASC'}DESC{else}ASC{/if}{if $labelID}&labelID={@$labelID}{/if}{/link}">
                                                                        {if $sortOrder === 'ASC'}
                                                                                <span class="jsTooltip" title="{lang}wcf.global.sorting{/lang} ({lang}wcf.global.sortOrder.ascending{/lang})">
-                                                                                       {icon size=16 name='arrow-down-wide-short'}
+                                                                                       {icon name='arrow-down-wide-short'}
                                                                                </span>
                                                                        {else}
                                                                                <span class="jsTooltip" title="{lang}wcf.global.sorting{/lang} ({lang}wcf.global.sortOrder.descending{/lang})">
-                                                                                       {icon size=16 name='arrow-down-short-wide'}
+                                                                                       {icon name='arrow-down-short-wide'}
                                                                                </span>
                                                                        {/if}
                                                                </a>
@@ -229,14 +229,14 @@
                                                                        {if $conversation->isClosed}
                                                                                <li>
                                                                                        <span class="jsIconLock jsTooltip" title="{lang}wcf.global.state.closed{/lang}">
-                                                                                               {icon size=16 name='lock'}
+                                                                                               {icon name='lock'}
                                                                                        </span>
                                                                                </li>
                                                                        {/if}
                                                                        {if $conversation->attachments}
                                                                                <li>
                                                                                        <span class="jsIconAttachment jsTooltip" title="{lang}wcf.conversation.attachments{/lang}">
-                                                                                               {icon size=16 name='paperclip'}
+                                                                                               {icon name='paperclip'}
                                                                                        </span>
                                                                                </li>
                                                                        {/if}
@@ -278,7 +278,7 @@
                                                        <div class="messageGroupListStatsSimple">
                                                                {if $conversation->replies}
                                                                        <span aria-label="{lang}wcf.conversation.replies{/lang}">
-                                                                               {icon size=16 name='comment'}
+                                                                               {icon name='comment'}
                                                                        </span>
                                                                        {@$conversation->replies|shortUnit}
                                                                {/if}
@@ -321,7 +321,7 @@
                                        {if $__wcf->session->getPermission('user.conversation.canStartConversation')}
                                                <li>
                                                        <a href="{link controller='ConversationAdd'}{/link}" title="{lang}wcf.conversation.add{/lang}" class="button buttonPrimary">
-                                                               {icon size=16 name='plus'}
+                                                               {icon name='plus'}
                                                                <span>{lang}wcf.conversation.button.add{/lang}</span>
                                                        </a>
                                                </li>

diff --git a/templates/conversationMessageList.tpl b/templates/conversationMessageList.tpl
index 28df64a172d06e89e20e92e2ea811fe70e0a504f..5c6ce33be36b06bc1111bc47a06c412c00e8648e 100644 (file)
--- a/templates/conversationMessageList.tpl
+++ b/templates/conversationMessageList.tpl
@@ -75,7 +75,7 @@
                                                                                title="{lang}wcf.conversation.message.edit{/lang}"
                                                                                class="button{if !$conversation->isDraft || $message->messageID != $conversation->firstMessageID} jsMessageEditButton{/if}"
                                                                        >
-                                                                               {icon size=16 name='pencil'}
+                                                                               {icon name='pencil'}
                                                                                <span>{lang}wcf.global.button.edit{/lang}</span>
                                                                        </a>
                                                                </li>
@@ -91,14 +91,14 @@
                                                                        title="{lang}wcf.message.quote.quoteMessage{/lang}"
                                                                        class="button jsTooltip{if $__quoteFullQuote|isset && $message->messageID|in_array:$__quoteFullQuote} active{/if}"
                                                                >
-                                                                       {icon size=16 name='quote-left' type='solid'}
+                                                                       {icon name='quote-left' type='solid'}
                                                                        <span class="invisible">{lang}wcf.message.quote.quoteMessage{/lang}</span>
                                                                </a>
                                                        </li>
                                                        {if $message->userID != $__wcf->getUser()->userID && $__wcf->session->getPermission('user.profile.canReportContent')}
                                                                <li class="jsReportConversationMessage jsOnly" data-object-id="{@$message->messageID}">
                                                                        <button title="{lang}wcf.moderation.report.reportContent{/lang}" class="button jsTooltip">
-                                                                               {icon size=16 name='triangle-exclamation'}
+                                                                               {icon name='triangle-exclamation'}
                                                                                <span class="invisible">{lang}wcf.moderation.report.reportContent{/lang}</span>
                                                                        </button>
                                                                </li>