From 3205ea47353f452ad04ec9239e85e4c0928d579f Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 28 May 2013 01:23:52 +0200
Subject: [PATCH] Clearfix overhaul

---
 com.woltlab.wcf/template/footer.tpl               | 2 +-
 com.woltlab.wcf/template/header.tpl               | 8 ++++----
 wcfsetup/install/files/acp/templates/footer.tpl   | 2 +-
 wcfsetup/install/files/acp/templates/header.tpl   | 6 +++---
 wcfsetup/install/files/style/bootstrap/mixin.less | 3 ---
 wcfsetup/install/files/style/layout.less          | 8 ++++++++
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/com.woltlab.wcf/template/footer.tpl b/com.woltlab.wcf/template/footer.tpl
index 16946c128e..11ba24abe2 100644
--- 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 322f5df1b2..d84155eed6 100644
--- 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 4bc8b9603c..2e6a466c00 100644
--- 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 aa044103ce..ad3eecf3da 100644
--- 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 8e9d495876..5b6cf628b2 100644
--- 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 0dd08885e4..c354e1dd1f 100644
--- 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) {
-- 
2.20.1