Some small template improvements/cleanups

diff --git a/com.woltlab.wcf/templates/__menu.tpl b/com.woltlab.wcf/templates/__menu.tpl
index 00e028adc19c8091d42588ce551631f3dabd6f9c..a794c46213b1a2743f2f2036375e3396aca6d8e0 100644 (file)
--- a/com.woltlab.wcf/templates/__menu.tpl
+++ b/com.woltlab.wcf/templates/__menu.tpl
@@ -5,7 +5,7 @@
                                <a href="{$menuItemNode->getMenuItem()->getURL()}" class="boxMenuLink">
                                        <span class="boxMenuLinkTitle">{lang}{$menuItemNode->getMenuItem()->title}{/lang}</span>
                                        {if $menuItemNode->getMenuItem()->getOutstandingItems() > 0}
-                                               <span class="boxMenuLinkOutstandingItems badge badgeInverse">{#$menuItemNode->getMenuItem()->getOutstandingItems()}</span>
+                                               <span class="boxMenuLinkOutstandingItems badge badgeUpdate">{#$menuItemNode->getMenuItem()->getOutstandingItems()}</span>
                                        {/if}
                                </a>
                                

diff --git a/com.woltlab.wcf/templates/dashboardBoxRecentActivitySidebar.tpl b/com.woltlab.wcf/templates/dashboardBoxRecentActivitySidebar.tpl
index 542949ffbd5654fda2f6f4bc8db4e7b9cdfcde49..704799d996a375483ff2b10c1890308b54fca9e3 100644 (file)
--- a/com.woltlab.wcf/templates/dashboardBoxRecentActivitySidebar.tpl
+++ b/com.woltlab.wcf/templates/dashboardBoxRecentActivitySidebar.tpl
@@ -4,7 +4,10 @@
                        <a href="{link controller='User' object=$event->getUserProfile()}{/link}" title="{$event->getUserProfile()->username}">{@$event->getUserProfile()->getAvatar()->getImageTag(24)}</a>
                        
                        <div class="sidebarBoxHeadline">
-                               <h3><a href="{link controller='User' object=$event->getUserProfile()}{/link}" class="userLink" data-user-id="{@$event->getUserProfile()->userID}">{$event->getUserProfile()->username}</a><small> - {@$event->time|time}</small></h3> 
+                               <h3>
+                                       <a href="{link controller='User' object=$event->getUserProfile()}{/link}" class="userLink" data-user-id="{@$event->getUserProfile()->userID}">{$event->getUserProfile()->username}</a>
+                                       <small class="separatorLeft">{@$event->time|time}</small>
+                               </h3> 
                                <small>{@$event->getTitle()}</small>
                        </div>
                </li>

diff --git a/com.woltlab.wcf/templates/dashboardBoxUsersOnlineSidebar.tpl b/com.woltlab.wcf/templates/dashboardBoxUsersOnlineSidebar.tpl
index b45c040d598c7172d6e86a823ef72e260f54c2fe..f4a16f0d4cb069cd2e63cc7e168bb1d6bfa5f747 100644 (file)
--- a/com.woltlab.wcf/templates/dashboardBoxUsersOnlineSidebar.tpl
+++ b/com.woltlab.wcf/templates/dashboardBoxUsersOnlineSidebar.tpl
@@ -4,4 +4,4 @@
        {/foreach}
 </ul>
 
-<p><small>{lang}wcf.user.usersOnline.detail{/lang}{if USERS_ONLINE_RECORD} - {lang}wcf.user.usersOnline.record{/lang}{/if}</small></p>
\ No newline at end of file
+<p><small>{lang}wcf.user.usersOnline.detail{/lang}{if USERS_ONLINE_RECORD} <span class="separatorLeft">{lang}wcf.user.usersOnline.record{/lang}</span>{/if}</small></p>
\ No newline at end of file

diff --git a/com.woltlab.wcf/templates/editHistory.tpl b/com.woltlab.wcf/templates/editHistory.tpl
index 814da194ccf5773d19808c6f8de1b698322fb94a..0d824b8ffdbb3d394b895ecc1844402bfe3c2403 100644 (file)
--- a/com.woltlab.wcf/templates/editHistory.tpl
+++ b/com.woltlab.wcf/templates/editHistory.tpl
@@ -67,7 +67,7 @@
        <section class="section tabularBox editHistoryVersionList">
                {assign var='versionCount' value=$objects|count}
                <h2 class="sectionTitle">
-                       {lang}wcf.edit.versions{/lang} <span class="badge badgeInverse">{#$versionCount+1}</span>
+                       {lang}wcf.edit.versions{/lang} <span class="badge">{#$versionCount+1}</span>
                </h2>
                
                <table class="table">

diff --git a/com.woltlab.wcf/templates/moderationList.tpl b/com.woltlab.wcf/templates/moderationList.tpl
index 55346a7c183d805a45fb1a668a553384fb9cd861..7ba66929d75648ff3bca9bf7842f25646e8bfdba 100644 (file)
--- a/com.woltlab.wcf/templates/moderationList.tpl
+++ b/com.woltlab.wcf/templates/moderationList.tpl
@@ -18,45 +18,41 @@
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 
 {capture assign='sidebarLeft'}
-       {* moderation type *}
        <section class="box">
+               {* moderation type *}
                <h2 class="boxTitle">{lang}wcf.moderation.filterByType{/lang}</h2>
                
                <nav class="boxContent">
-                       <ul>
-                               <li{if $definitionID == 0} class="active"{/if}><a href="{link controller='ModerationList'}definitionID=0&assignedUserID={@$assignedUserID}&status={@$status}&pageNo={@$pageNo}&sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">{lang}wcf.moderation.type.all{/lang}</a></li>
+                       <ul class="boxMenu">
+                               <li{if $definitionID == 0} class="active"{/if}><a class="boxMenuLink" href="{link controller='ModerationList'}definitionID=0&assignedUserID={@$assignedUserID}&status={@$status}&pageNo={@$pageNo}&sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">{lang}wcf.moderation.type.all{/lang}</a></li>
                                {foreach from=$availableDefinitions key=__definitionID item=definitionName}
-                                       <li{if $definitionID == $__definitionID} class="active"{/if}><a href="{link controller='ModerationList'}definitionID={@$__definitionID}&assignedUserID={@$assignedUserID}&status={@$status}&pageNo={@$pageNo}&sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">{lang}wcf.moderation.type.{$definitionName}{/lang}</a></li>
+                                       <li{if $definitionID == $__definitionID} class="active"{/if}><a class="boxMenuLink" href="{link controller='ModerationList'}definitionID={@$__definitionID}&assignedUserID={@$assignedUserID}&status={@$status}&pageNo={@$pageNo}&sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">{lang}wcf.moderation.type.{$definitionName}{/lang}</a></li>
                                {/foreach}
                                
                                {event name='sidebarModerationType'}
                        </ul>
                </nav>
-       </section>
-       
-       {* assigned user *}
-       <section class="box">
+               
+               {* assigned user *}
                <h2 class="boxTitle">{lang}wcf.moderation.filterByUser{/lang}</h2>
                
                <nav class="boxContent">
-                       <ul>
-                               <li{if $assignedUserID == -1} class="active"{/if}><a href="{link controller='ModerationList'}definitionID={@$definitionID}&assignedUserID=-1&status={@$status}&pageNo={@$pageNo}&sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">{lang}wcf.moderation.filterByUser.allEntries{/lang}</a></li>
-                               <li{if $assignedUserID == 0} class="active"{/if}><a href="{link controller='ModerationList'}definitionID={@$definitionID}&assignedUserID=0&status={@$status}&pageNo={@$pageNo}&sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">{lang}wcf.moderation.filterByUser.nobody{/lang}</a></li>
-                               <li{if $assignedUserID == $__wcf->getUser()->userID} class="active"{/if}><a href="{link controller='ModerationList'}definitionID={@$definitionID}&assignedUserID={@$__wcf->getUser()->userID}&status={@$status}&pageNo={@$pageNo}&sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">{lang}wcf.moderation.filterByUser.myself{/lang}</a></li>
+                       <ul class="boxMenu">
+                               <li{if $assignedUserID == -1} class="active"{/if}><a class="boxMenuLink" href="{link controller='ModerationList'}definitionID={@$definitionID}&assignedUserID=-1&status={@$status}&pageNo={@$pageNo}&sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">{lang}wcf.moderation.filterByUser.allEntries{/lang}</a></li>
+                               <li{if $assignedUserID == 0} class="active"{/if}><a class="boxMenuLink" href="{link controller='ModerationList'}definitionID={@$definitionID}&assignedUserID=0&status={@$status}&pageNo={@$pageNo}&sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">{lang}wcf.moderation.filterByUser.nobody{/lang}</a></li>
+                               <li{if $assignedUserID == $__wcf->getUser()->userID} class="active"{/if}><a class="boxMenuLink" href="{link controller='ModerationList'}definitionID={@$definitionID}&assignedUserID={@$__wcf->getUser()->userID}&status={@$status}&pageNo={@$pageNo}&sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">{lang}wcf.moderation.filterByUser.myself{/lang}</a></li>
                                
                                {event name='sidebarAssignedUser'}
                        </ul>
                </nav>
-       </section>
-       
-       {* status *}
-       <section class="box">
+               
+               {* status *}
                <h2 class="boxTitle">{lang}wcf.moderation.status{/lang}</h2>
                
                <nav class="boxContent">
-                       <ul>
-                               <li{if $status == -1} class="active"{/if}><a href="{link controller='ModerationList'}definitionID={@$definitionID}&assignedUserID={@$assignedUserID}&status=-1&pageNo={@$pageNo}&sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">{lang}wcf.moderation.status.outstanding{/lang}</a></li>
-                               <li{if $status == 2} class="active"{/if}><a href="{link controller='ModerationList'}definitionID={@$definitionID}&assignedUserID={@$assignedUserID}&status=2&pageNo={@$pageNo}&sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">{lang}wcf.moderation.status.done{/lang}</a></li>
+                       <ul class="boxMenu">
+                               <li{if $status == -1} class="active"{/if}><a class="boxMenuLink" href="{link controller='ModerationList'}definitionID={@$definitionID}&assignedUserID={@$assignedUserID}&status=-1&pageNo={@$pageNo}&sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">{lang}wcf.moderation.status.outstanding{/lang}</a></li>
+                               <li{if $status == 2} class="active"{/if}><a class="boxMenuLink" href="{link controller='ModerationList'}definitionID={@$definitionID}&assignedUserID={@$assignedUserID}&status=2&pageNo={@$pageNo}&sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">{lang}wcf.moderation.status.done{/lang}</a></li>
                                
                                {event name='sidebarStatus'}
                        </ul>
@@ -73,7 +69,7 @@
 {include file='header'}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{if $status == 2}{lang}wcf.moderation.doneItems{/lang}{else}{lang}wcf.moderation.outstandingItems{/lang}{/if} <span class="badge badgeInverse">{#$items}</span></h1>
+       <h1 class="contentTitle">{if $status == 2}{lang}wcf.moderation.doneItems{/lang}{else}{lang}wcf.moderation.outstandingItems{/lang}{/if} <span class="badge">{#$items}</span></h1>
 </header>
 
 {include file='userNotice'}
@@ -111,7 +107,7 @@
                                        <tr class="moderationQueueEntry{if $entry->isNew()} new{/if}" data-queue-id="{@$entry->queueID}">
                                                <td class="columnIcon columnAvatar">
                                                        <div>
-                                                               <p{if $entry->isNew()} title="{lang}wcf.moderation.markAsRead.doubleClick{/lang}"{/if}>{@$entry->getUserProfile()->getAvatar()->getImageTag(32)}</p>
+                                                               <p{if $entry->isNew()} title="{lang}wcf.moderation.markAsRead.doubleClick{/lang}"{/if}>{@$entry->getUserProfile()->getAvatar()->getImageTag(48)}</p>
                                                        </div>
                                                </td>
                                                <td class="columnText columnSubject">
@@ -119,7 +115,14 @@
                                                                <span class="badge label">{lang}wcf.moderation.type.{@$definitionNames[$entry->objectTypeID]}{/lang}</span>
                                                                <a href="{$entry->getLink()}" class="messageGroupLink">{$entry->getTitle()|tableWordwrap}</a>
                                                        </h3>
-                                                       <small>{if $entry->getAffectedObject()->getUserID()}<a href="{link controller='User' id=$entry->getAffectedObject()->getUserID()}{/link}" class="userLink" data-user-id="{@$entry->getAffectedObject()->getUserID()}">{$entry->getAffectedObject()->getUsername()}</a>{else}{$entry->getAffectedObject()->getUsername()}{/if} - {@$entry->getAffectedObject()->getTime()|time} - {lang}wcf.moderation.type.{@$entry->getObjectTypeName()}{/lang}</small>        
+                                                       
+                                                       <ul class="inlineList dotSeparated small messageGroupInfo">
+                                                               <li class="messageGroupAuthor">{if $entry->getAffectedObject()->getUserID()}<a href="{link controller='User' id=$entry->getAffectedObject()->getUserID()}{/link}" class="userLink" data-user-id="{@$entry->getAffectedObject()->getUserID()}">{$entry->getAffectedObject()->getUsername()}</a>{else}{$entry->getAffectedObject()->getUsername()}{/if}</li>
+                                                               <li class="messageGroupTime">{@$entry->getAffectedObject()->getTime()|time}</li>
+                                                               <li>{lang}wcf.moderation.type.{@$entry->getObjectTypeName()}{/lang}</li>
+                                                               
+                                                               {event name='messageGroupInfo'}
+                                                       </ul>
                                                </td>
                                                <td class="columnText columnAssignedUserID">{if $entry->assignedUserID}<a href="{link controller='User' id=$entry->assignedUserID}{/link}" class="userLink" data-user-id="{@$entry->assignedUserID}">{$entry->assignedUsername}</a>{/if}</td>
                                                <td class="columnDigits columnComments">{#$entry->comments}</td>

diff --git a/com.woltlab.wcf/templates/moderationQueueList.tpl b/com.woltlab.wcf/templates/moderationQueueList.tpl
index 509cef6e774bed42583bf9d51587239cae011f80..ff2a389c0a5f8ea7ab9ba5bfb95d28b327cc994c 100644 (file)
--- a/com.woltlab.wcf/templates/moderationQueueList.tpl
+++ b/com.woltlab.wcf/templates/moderationQueueList.tpl
@@ -6,7 +6,7 @@
                        </div>
                        <div>
                                <h3><a href="{@$queue->getLink()}">{$queue->getAffectedObject()->getTitle()}</a></h3>
-                               <small>{if $queue->getUserProfile()->userID}<a href="{link controller='User' object=$queue->getUserProfile()->getDecoratedObject()}{/link}">{$queue->getAffectedObject()->getUsername()}</a>{else}{$queue->getAffectedObject()->getUsername()}{/if} - {@$queue->lastChangeTime|time}</small>
+                               <small>{if $queue->getUserProfile()->userID}<a href="{link controller='User' object=$queue->getUserProfile()->getDecoratedObject()}{/link}">{$queue->getAffectedObject()->getUsername()}</a>{else}{$queue->getAffectedObject()->getUsername()}{/if} <span class="separatorLeft">{@$queue->lastChangeTime|time}</span></small>
                        </div>
                </div>
        </li>

diff --git a/com.woltlab.wcf/templates/pageMenuMobile.tpl b/com.woltlab.wcf/templates/pageMenuMobile.tpl
index e73ed15dcf9439801f5d8e503817cbabf10ebc28..b247eedb8c95fe9d9c7364e2f4e95330e2c88f83 100644 (file)
--- a/com.woltlab.wcf/templates/pageMenuMobile.tpl
+++ b/com.woltlab.wcf/templates/pageMenuMobile.tpl
@@ -14,7 +14,7 @@
                                        <a href="{$menuItemNode->getMenuItem()->getURL()}" class="menuOverlayItemLink{if $__outstandingItems} menuOverlayItemBadge{/if}">
                                                <span class="menuOverlayItemTitle">{lang}{$menuItemNode->getMenuItem()->title}{/lang}</span>
                                                {if $__outstandingItems}
-                                                       <span class="badge badgeInverse">{#$__outstandingItems}</span>
+                                                       <span class="badge badgeUpdate">{#$__outstandingItems}</span>
                                                {/if}
                                        </a>
                                        

diff --git a/com.woltlab.wcf/templates/tagged.tpl b/com.woltlab.wcf/templates/tagged.tpl
index f49443372d6bfb6b4c7201b904aaa12b01905c02..3599932b31d43a5bfdba66cfaa0dde08cc7e16d9 100644 (file)
--- a/com.woltlab.wcf/templates/tagged.tpl
+++ b/com.woltlab.wcf/templates/tagged.tpl
@@ -21,9 +21,9 @@
                <h2 class="boxTitle">{lang}wcf.tagging.objectTypes{/lang}</h2>
                
                <nav class="boxContent">
-                       <ul>
+                       <ul class="boxMenu">
                                {foreach from=$availableObjectTypes item=availableObjectType}
-                                       <li{if $objectType == $availableObjectType->objectType} class="active"{/if}><a href="{link controller='Tagged' object=$tag}objectType={@$availableObjectType->objectType}{/link}">{lang}wcf.tagging.objectType.{@$availableObjectType->objectType}{/lang}</a></li>
+                                       <li{if $objectType == $availableObjectType->objectType} class="active"{/if}><a class="boxMenuLink" href="{link controller='Tagged' object=$tag}objectType={@$availableObjectType->objectType}{/link}">{lang}wcf.tagging.objectType.{@$availableObjectType->objectType}{/lang}</a></li>
                                {/foreach}
                        </ul>
                </nav>

diff --git a/com.woltlab.wcf/templates/userMenuSidebar.tpl b/com.woltlab.wcf/templates/userMenuSidebar.tpl
index 001e02ae497ac6bd243cfc846f971677875dee56..d06defda5414c52ad74c7feee920d6c85cce8408 100644 (file)
--- a/com.woltlab.wcf/templates/userMenuSidebar.tpl
+++ b/com.woltlab.wcf/templates/userMenuSidebar.tpl
@@ -10,23 +10,21 @@
                        }
                });
                //]]>
-       </script> 
+       </script>
        
-       {foreach from=$__wcf->getUserMenu()->getMenuItems('') item=menuCategory}
-               <section class="box">
+       <section class="box">
+               {foreach from=$__wcf->getUserMenu()->getMenuItems('') item=menuCategory}
                        <h2 class="boxTitle">{lang}{$menuCategory->menuItem}{/lang}</h2>
                        
-                       <div class="boxContent">
-                               <nav>
-                                       <ol class="boxMenu">
-                                               {foreach from=$__wcf->getUserMenu()->getMenuItems($menuCategory->menuItem) item=menuItem}
-                                                       <li{if $menuItem->menuItem|in_array:$__userMenuActiveItems} class="active"{/if}>
-                                                               <a href="{$menuItem->getProcessor()->getLink()}" class="boxMenuLink"><span class="boxMenuLinkTitle">{@$menuItem}</span></a>
-                                                       </li>
-                                               {/foreach}
-                                       </ol>
-                               </nav>
-                       </div>  
-               </section>
-       {/foreach}
+                       <nav class="boxContent">
+                               <ol class="boxMenu">
+                                       {foreach from=$__wcf->getUserMenu()->getMenuItems($menuCategory->menuItem) item=menuItem}
+                                               <li{if $menuItem->menuItem|in_array:$__userMenuActiveItems} class="active"{/if}>
+                                                       <a href="{$menuItem->getProcessor()->getLink()}" class="boxMenuLink"><span class="boxMenuLinkTitle">{@$menuItem}</span></a>
+                                               </li>
+                                       {/foreach}
+                               </ol>
+                       </nav>
+               {/foreach}
+       </section>
 {/capture}

diff --git a/wcfsetup/install/files/acp/templates/categoryAdd.tpl b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
index 177bc4db712b17c2c285e126c52f7ef800de1035..4aca0482ba0df501774760e4ac83fddf8c81af16 100644 (file)
--- a/wcfsetup/install/files/acp/templates/categoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
@@ -97,9 +97,9 @@
                {/if}
                
                <dl{if $errorField == 'isDisabled'} class="formError"{/if}>
-                       <dt class="reversed"><label for="isDisabled">{@$objectType->getProcessor()->getLanguageVariable('isDisabled')}</label></dt>
+                       <dt></dt>
                        <dd>
-                               <input type="checkbox" id="isDisabled" name="isDisabled"{if $isDisabled} checked="checked"{/if} />
+                               <label><input type="checkbox" id="isDisabled" name="isDisabled"{if $isDisabled} checked="checked"{/if} /> {@$objectType->getProcessor()->getLanguageVariable('isDisabled')}</label>
                                {hascontent}<small>{content}{@$objectType->getProcessor()->getLanguageVariable('isDisabled.description', true)}{/content}</small>{/hascontent}
                        </dd>
                </dl>

diff --git a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
index c6658b352539cbdedc6006215804ae64a1dbd8ca..2e53cfc8c11ed803bf1e9214fae2e59b5dbebad9 100644 (file)
--- a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
+++ b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
@@ -35,7 +35,7 @@
                                
                                {if $__wcf->session->getPermission('admin.configuration.package.canUpdatePackage') && $__wcf->getAvailableUpdates()}
                                        <li>
-                                               <a href="{link controller='PackageUpdate'}{/link}"><span class="icon icon32 fa-refresh"></span> <span>{lang}wcf.acp.package.updates{/lang}</span> <span class="badge badgeInverse">{#$__wcf->getAvailableUpdates()}</span></a>
+                                               <a href="{link controller='PackageUpdate'}{/link}"><span class="icon icon32 fa-refresh"></span> <span>{lang}wcf.acp.package.updates{/lang}</span> <span class="badge badgeUpdate">{#$__wcf->getAvailableUpdates()}</span></a>
                                        </li>
                                {/if}
                        {/if}

diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js
index 6cf2b492c631def8237f248c390c628404740126..43de8e52e944ca766939abfc55482ab2fd9d710c 100644 (file)
--- a/wcfsetup/install/files/js/WCF.User.js
+++ b/wcfsetup/install/files/js/WCF.User.js
@@ -384,7 +384,7 @@ WCF.User.Panel.Abstract = Class.extend({
                
                if (count) {
                        if (this._badge === null) {
-                               this._badge = $('<span class="badge badgeInverse" />').appendTo(this._triggerElement.children('a'));
+                               this._badge = $('<span class="badge badgeUpdate" />').appendTo(this._triggerElement.children('a'));
                                this._badge.before(' ');
                        }
                        

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index d0a657f868bf64ecdae14469b54ec49626b307dc..8dda8b75eddfe937fb3edd3e006d530d964ac6da 100755 (executable)
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -7502,7 +7502,7 @@ WCF.UserPanel = Class.extend({
                if (count) {
                        var $badge = this._container.find('.badge');
                        if (!$badge.length) {
-                               $badge = $('<span class="badge badgeInverse" />').appendTo(this._container.children('.dropdownToggle'));
+                               $badge = $('<span class="badge badgeUpdate" />').appendTo(this._container.children('.dropdownToggle'));
                                $badge.before(' ');
                        }
                        $badge.html(count);

diff --git a/wcfsetup/install/files/style/ui/badge.scss b/wcfsetup/install/files/style/ui/badge.scss
index ab2fd89072537ea13deef068a6cf2ee944fa34b8..f8e90595f79f338265c2822d2bf8ee5b51087bd0 100644 (file)
--- a/wcfsetup/install/files/style/ui/badge.scss
+++ b/wcfsetup/install/files/style/ui/badge.scss
@@ -19,12 +19,7 @@ a.badge {
                color: rgba(255, 255, 255, 1);
                font-weight: 600;
        }
-       
-       &.badgeInverse {
-               background-color: $wcfContentBackground;
-               color: $wcfContentText;
-       }
-       
+               
        /* default label colors */
        &.green {
                background-color: rgba(0, 153, 0, 1);

diff --git a/wcfsetup/install/files/style/ui/message.scss b/wcfsetup/install/files/style/ui/message.scss
index 672020495ef8fcbc8709ebe5bb22f71d80c45658..0e0679eac5e5cf83fd939e9954155f1c28d20965 100644 (file)
--- a/wcfsetup/install/files/style/ui/message.scss
+++ b/wcfsetup/install/files/style/ui/message.scss
@@ -177,7 +177,10 @@
        display: flex;
        flex: 0 0 auto;
        justify-content: flex-end;
-       margin-bottom: 20px;
+               
+       + .messageBody {
+               margin-top: 20px;
+       }
        
        > .messageQuickOptions {
                flex: 0 0 auto;
@@ -226,6 +229,10 @@
        .messagePublicationTime {
                color: $wcfContentDimmedText;
        }
+       
+       + .messageStatus {
+               margin-left: 5px;
+       }
 }
 
 .messageStatus {