Fixed badges in main menu

diff --git a/com.woltlab.wcf/template/mainMenu.tpl b/com.woltlab.wcf/template/mainMenu.tpl
index 55d3431916c428b8c9cfeb2b4d4203ebb837e6f0..9e103d46bdb2432614679b6dee779662c3f4d59c 100644 (file)
--- a/com.woltlab.wcf/template/mainMenu.tpl
+++ b/com.woltlab.wcf/template/mainMenu.tpl
@@ -2,7 +2,7 @@
        <nav id="mainMenu" class="mainMenu">
                <ul>
                        {foreach from=$__wcf->getPageMenu()->getMenuItems('header') item=menuItem}
-                               <li{if $__wcf->getPageMenu()->getActiveMenuItem() == $menuItem->menuItem} class="active"{/if}><a href="{$menuItem->getProcessor()->getLink()}">{lang}{$menuItem->menuItem}{/lang}{if $menuItem->getProcessor()->getNotifications()} <span class="badge {if $__wcf->getPageMenu()->getActiveMenuItem() == $menuItem->menuItem}badgeUpdate{else}badgeInverse{/if}">{#$menuItem->getProcessor()->getNotifications()}</span>{/if}</a></li>
+                               <li{if $__wcf->getPageMenu()->getActiveMenuItem() == $menuItem->menuItem} class="active"{/if}><a href="{$menuItem->getProcessor()->getLink()}">{lang}{$menuItem->menuItem}{/lang}{if $menuItem->getProcessor()->getNotifications()} <span class="badge badgeUpdate">{#$menuItem->getProcessor()->getNotifications()}</span>{/if}</a></li>
                        {/foreach}
                </ul>
        </nav>

diff --git a/wcfsetup/install/files/style/global.less b/wcfsetup/install/files/style/global.less
index a282125140042ddb82d9e516aea758478e8d8315..a897a5c8dd268a87878c1d7908fad5bf291fb8ee 100644 (file)
--- a/wcfsetup/install/files/style/global.less
+++ b/wcfsetup/install/files/style/global.less
@@ -208,16 +208,6 @@ a.badge:hover {
        top: -3px;
 }
 
-.mainMenu > ul > li > a > .badge {
-       font-size: 70%;
-       top: -1px;
-}
-
-.mainMenu > ul > li.active > a > .badge {
-       font-size: 65%;
-       top: -2px;
-}
-
 .tabularBoxTitle > hgroup > h1 > .badge {
        font-size: 70%;
        top: -1px;

diff --git a/wcfsetup/install/files/style/layout.less b/wcfsetup/install/files/style/layout.less
index 67006eeec2186c3d6246030be620338e385f9766..223a7f3e1df4669f6f0650df131ca9ff61e1cff2 100644 (file)
--- a/wcfsetup/install/files/style/layout.less
+++ b/wcfsetup/install/files/style/layout.less
@@ -150,6 +150,11 @@
                                        background-color: @wcfMainMenuHoverBackgroundColor;
                                        text-decoration: none;
                                }
+                               
+                               > .badge {
+                                       font-size: 60%;
+                                       top: -2px;
+                               }
                        }
                        
                        &.active {