From f6e330bfcb26f0198c3706d2673e53d6eb4a1faf Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 24 Oct 2015 20:25:13 +0200
Subject: [PATCH] Generic `layoutBoundary` to cover all your bases

---
 com.woltlab.wcf/templates/footer.tpl              |  4 ++--
 com.woltlab.wcf/templates/header.tpl              |  2 +-
 com.woltlab.wcf/templates/pageHeader.tpl          |  2 +-
 wcfsetup/install/files/acp/templates/footer.tpl   |  2 +-
 wcfsetup/install/files/acp/templates/header.tpl   |  6 +++---
 .../install/files/acp/templates/pageHeader.tpl    |  2 +-
 wcfsetup/install/files/style/layout/global.scss   | 15 ++++++++++-----
 7 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/templates/footer.tpl
index 9b25060029..55d2a2b5ce 100644
--- a/com.woltlab.wcf/templates/footer.tpl
+++ b/com.woltlab.wcf/templates/footer.tpl
@@ -12,7 +12,7 @@
 	</section>
 	
 	<div id="pageFooterBoxes">
-		<div class="layoutFluid">
+		<div class="layoutBoundary">
 			{hascontent}
 				<ul>
 					{content}{if !$footerBoxes|empty}{@$footerBoxes}{/if}{/content}
@@ -40,7 +40,7 @@
 	</nav>*}
 	
 	<footer id="pageFooter" class="footer{if $sidebarOrientation|isset && $sidebar|isset} sidebarOrientation{@$sidebarOrientation|ucfirst}{if $sidebarOrientation == 'right' && $sidebarCollapsed} sidebarCollapsed{/if}{/if}">
-		<div class="layoutFluid">
+		<div class="layoutBoundary">
 			<div class="footerContent">
 				{event name='footerContents'}
 				
diff --git a/com.woltlab.wcf/templates/header.tpl b/com.woltlab.wcf/templates/header.tpl
index 6dd9f0c587..90a5f66136 100644
--- a/com.woltlab.wcf/templates/header.tpl
+++ b/com.woltlab.wcf/templates/header.tpl
@@ -10,7 +10,7 @@
 	{include file='pageNavbarTop'}
 	
 	<section id="main" class="main" role="main">
-		<div class="{if $__wcf->getStyleHandler()->getStyle()->getVariable('useFluidLayout')}layoutFluid{else}layoutFixed{/if}">
+		<div class="layoutBoundary">
 			{capture assign='__sidebar'}
 				{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}>
diff --git a/com.woltlab.wcf/templates/pageHeader.tpl b/com.woltlab.wcf/templates/pageHeader.tpl
index 7286a33fc6..1b8091f325 100644
--- a/com.woltlab.wcf/templates/pageHeader.tpl
+++ b/com.woltlab.wcf/templates/pageHeader.tpl
@@ -1,6 +1,6 @@
 <header id="pageHeader" class="pageHeader">
 	<div>
-		<div class="{if $__wcf->getStyleHandler()->getStyle()->getVariable('useFluidLayout')}layoutFluid{else}layoutFixed{/if}">
+		<div class="layoutBoundary">
 			{include file='pageHeaderLogo'}
 			
 			{include file='pageHeaderSearch'}
diff --git a/wcfsetup/install/files/acp/templates/footer.tpl b/wcfsetup/install/files/acp/templates/footer.tpl
index 3e023b4674..98f61f5111 100644
--- a/wcfsetup/install/files/acp/templates/footer.tpl
+++ b/wcfsetup/install/files/acp/templates/footer.tpl
@@ -3,7 +3,7 @@
 	</section>
 	
 	<footer id="pageFooter" class="footer">
-		<div class="layoutFluid">
+		<div class="layoutBoundary">
 			{*<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>
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 792d9fd548..70bfbeedc0 100644
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -160,11 +160,11 @@
 		<section id="main" class="main" role="main">
 	
 	{*
-	<header id="pageHeader" class="layoutFluid">
+	<header id="pageHeader" class="layoutBoundary">
 		<div>
 			{if $__wcf->user->userID}
 				<nav id="topMenu" class="userPanel">
-					<div class="layoutFluid">
+					<div class="layoutBoundary">
 						<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>
@@ -261,6 +261,6 @@
 	</header>
 	*}
 	
-	<div class="layoutFluid">
+	<div class="layoutBoundary">
 		<div id="content" class="content">
 				
diff --git a/wcfsetup/install/files/acp/templates/pageHeader.tpl b/wcfsetup/install/files/acp/templates/pageHeader.tpl
index b0e30eee10..3044c2d9b0 100644
--- a/wcfsetup/install/files/acp/templates/pageHeader.tpl
+++ b/wcfsetup/install/files/acp/templates/pageHeader.tpl
@@ -1,6 +1,6 @@
 <header id="pageHeader" class="pageHeader">
 	<div>
-		<div class="layoutFluid">
+		<div class="layoutBoundary">
 			{include file='pageLogo'}
 			
 			{include file='pageSearchArea'}
diff --git a/wcfsetup/install/files/style/layout/global.scss b/wcfsetup/install/files/style/layout/global.scss
index 7ef1e643e5..8925b8e124 100644
--- a/wcfsetup/install/files/style/layout/global.scss
+++ b/wcfsetup/install/files/style/layout/global.scss
@@ -1,8 +1,13 @@
-.layoutFluid {
-	margin-left: auto;
-	margin-right: auto;
-	min-width: $wcfLayoutMinWidth;
-	max-width: $wcfLayoutMaxWidth;
+.layoutBoundary {
+	margin: 0 auto;
+	
+	@if $useFluidLayout {
+		min-width: $wcfLayoutMinWidth;
+		max-width: $wcfLayoutMaxWidth;
+	}
+	@else {
+		width: $wcfLayoutFixedWidth;
+	}
 }
 
 .marginTop {
-- 
2.20.1