Clearfix overhaul

diff --git a/com.woltlab.wcf/template/footer.tpl b/com.woltlab.wcf/template/footer.tpl
index 16946c128e379de35b72f0b8a056a88db4442484..11ba24abe23c16b1eb0cf63f49014e128e9e8558 100644 (file)
--- a/com.woltlab.wcf/template/footer.tpl
+++ b/com.woltlab.wcf/template/footer.tpl
@@ -8,7 +8,7 @@
 
 <footer id="pageFooter" class="{if $__wcf->getStyleHandler()->getStyle()->getVariable('useFluidLayout')}layoutFluid{else}layoutFixed{/if} footer">
        <div>
-               <nav id="footerNavigation" class="navigation navigationFooter clearfix">
+               <nav id="footerNavigation" class="navigation navigationFooter">
                        {include file='footerMenu'}
                        
                        <ul class="navigationIcons">

diff --git a/com.woltlab.wcf/template/header.tpl b/com.woltlab.wcf/template/header.tpl
index 322f5df1b2ef1361f8993d1e888427ba715fcb6f..d84155eed60d7a648c99a67f0f3393db64913be0 100644 (file)
--- a/com.woltlab.wcf/template/header.tpl
+++ b/com.woltlab.wcf/template/header.tpl
@@ -3,7 +3,7 @@
 <header id="pageHeader" class="{if $__wcf->getStyleHandler()->getStyle()->getVariable('useFluidLayout')}layoutFluid{else}layoutFixed{/if}">
        <div>
                <nav id="topMenu" class="userPanel">
-                       <div class="{if $__wcf->getStyleHandler()->getStyle()->getVariable('useFluidLayout')}layoutFluid{else}layoutFixed{/if} clearfix">
+                       <div class="{if $__wcf->getStyleHandler()->getStyle()->getVariable('useFluidLayout')}layoutFluid{else}layoutFixed{/if}">
                                {hascontent}
                                        <ul class="userPanelItems">
                                                {content}
@@ -30,7 +30,7 @@
                
                {include file='mainMenu'}
                
-               <nav class="navigation navigationHeader clearfix">
+               <nav class="navigation navigationHeader">
                        {include file='mainMenuSubMenu'}
                        
                        <ul class="navigationIcons">
@@ -43,7 +43,7 @@
        </div>
 </header>
 
-<div id="main" class="{if $__wcf->getStyleHandler()->getStyle()->getVariable('useFluidLayout')}layoutFluid{else}layoutFixed{/if}{if $sidebarOrientation|isset && $sidebar|isset} sidebarOrientation{@$sidebarOrientation|ucfirst} clearfix{if $sidebarOrientation == 'right' && $sidebarCollapsed} sidebarCollapsed{/if}{/if}">
+<div id="main" class="{if $__wcf->getStyleHandler()->getStyle()->getVariable('useFluidLayout')}layoutFluid{else}layoutFixed{/if}{if $sidebarOrientation|isset && $sidebar|isset} sidebarOrientation{@$sidebarOrientation|ucfirst}{if $sidebarOrientation == 'right' && $sidebarCollapsed} sidebarCollapsed{/if}{/if}">
        <div>
                {if $sidebar|isset}
                        <aside class="sidebar"{if $sidebarOrientation|isset && $sidebarOrientation == 'right'} data-is-open="{if $sidebarCollapsed}false{else}true{/if}" data-sidebar-name="{$sidebarName}"{/if}>
@@ -67,7 +67,7 @@
                        {/if}
                {/if}
                                
-               <section id="content" class="content clearfix">
+               <section id="content" class="content">
                        
                        {event name='contents'}
                        

diff --git a/wcfsetup/install/files/acp/templates/footer.tpl b/wcfsetup/install/files/acp/templates/footer.tpl
index 4bc8b9603ce653632b3a576aac9a0c99366b02f7..2e6a466c00dc242309317c9c29fd3902af5d00c9 100644 (file)
--- a/wcfsetup/install/files/acp/templates/footer.tpl
+++ b/wcfsetup/install/files/acp/templates/footer.tpl
@@ -3,7 +3,7 @@
        </div>
        
        <footer id="pageFooter" class="layoutFluid footer">
-               <nav id="footerNavigation" class="navigation navigationFooter clearfix">
+               <nav id="footerNavigation" class="navigation navigationFooter">
                        <ul class="navigationIcons">
                                <li id="toTopLink" class="toTopLink"><a href="{$__wcf->getAnchor('top')}" title="{lang}wcf.global.scrollUp{/lang}" class="jsTooltip"><span class="icon icon16 icon-arrow-up"></span> <span class="invisible">{lang}wcf.global.scrollUp{/lang}</span></a></li>
                                {event name='navigationIcons'}

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index aa044103cedc8b5f4181ca3a36e96611f2fc0569..ad3eecf3dafa2ef88d5e8e81e34ac1d5bcee7748 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -114,7 +114,7 @@
                <div>
                        {if $__wcf->user->userID}
                                <nav id="topMenu" class="userPanel">
-                                       <div class="layoutFluid clearfix">
+                                       <div class="layoutFluid">
                                                <ul class="userPanelItems">
                                                        <li id="userMenu" class="dropdown">
                                                                <a class="dropdownToggle framed" data-toggle="userMenu">{if PACKAGE_ID}{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(24)} {/if}{lang}wcf.user.userNote{/lang}</a>
@@ -160,7 +160,7 @@
                                {/hascontent}
                        {/if}
                        
-                       <nav class="navigation navigationHeader clearfix">
+                       <nav class="navigation navigationHeader">
                                <ul class="navigationIcons">
                                        <li id="toBottomLink" class="toBottomLink"><a href="{@$__wcf->getAnchor('bottom')}" title="{lang}wcf.global.scrollDown{/lang}" class="jsTooltip"><span class="icon icon16 icon-arrow-down"></span> <span class="invisible">{lang}wcf.global.scrollDown{/lang}</span></a></li>
                                        {event name='navigationIcons'}
@@ -206,5 +206,5 @@
                                </aside>
                        {/hascontent}
                        
-                       <section id="content" class="content clearfix">
+                       <section id="content" class="content">
                                
\ No newline at end of file

diff --git a/wcfsetup/install/files/style/bootstrap/mixin.less b/wcfsetup/install/files/style/bootstrap/mixin.less
index 8e9d495876da987a202e90214fc68751d65fdc44..5b6cf628b28fc38347b79ccd30cf9061de8f731e 100644 (file)
--- a/wcfsetup/install/files/style/bootstrap/mixin.less
+++ b/wcfsetup/install/files/style/bootstrap/mixin.less
@@ -1,9 +1,6 @@
 /* shortcuts */
 // clearing floats like a boss h5bp.com/q
 .clearfix {
-       // trigger 'hasLayout'
-       *zoom: 1;
-       
        &:before,
        &:after {
                display: table;

diff --git a/wcfsetup/install/files/style/layout.less b/wcfsetup/install/files/style/layout.less
index 0dd08885e4dec6b00dfde9c4fe896dd5b283f5d5..c354e1dd1fa28a052e3e729549633cc2c400d0f6 100644 (file)
--- a/wcfsetup/install/files/style/layout.less
+++ b/wcfsetup/install/files/style/layout.less
@@ -521,12 +521,16 @@
 }
 
 .navigationHeader {
+       .clearfix;
+       
        background-color: @wcfNavigationHeaderBackgroundColor;
        border-bottom: 1px solid @wcfContainerBorderColor;
        border-top: 1px solid @wcfContainerBorderColor;
 }
        
 .navigationFooter {
+       .clearfix;
+       
        background-color: @wcfNavigationFooterBackgroundColor;
        border-top: 1px solid @wcfContainerBorderColor;
 }
@@ -660,6 +664,10 @@
                        float: right;
                }
        }
+       
+       .content {
+               .clearfix;
+       }
 }
 
 @media only screen and (max-width: 800px) {