From 5cb431d9fd67da7403c6e7e14d76b39bff3094a8 Mon Sep 17 00:00:00 2001
From: Paul Clarke <paul@silverstripe.com>
Date: Fri, 21 Oct 2016 12:00:34 +1300
Subject: [PATCH] add flexbox layout to sitetree area

---
 .../SilverStripe/CMS/Controllers/Includes/CMSMain_PageList.ss  | 2 +-
 .../CMS/Controllers/Includes/CMSMain_PageList_Sidebar.ss       | 2 +-
 .../CMS/Controllers/Includes/CMSPagesController_Content.ss     | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_PageList.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_PageList.ss
index 1fbea925..3bd15243 100644
--- a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_PageList.ss
+++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_PageList.ss
@@ -1,4 +1,4 @@
-<div class="cms-content-view fill-height flexbox-display" data-pjax-fragment="Content-PageList">
+<div class="flexbox-area-grow cms-content-view" data-pjax-fragment="Content-PageList">
 	<% if $ViewState == 'listview' %>
 		<% include SilverStripe\\CMS\\Controllers\\CMSMain_ListView %>
 	<% else %>
diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_PageList_Sidebar.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_PageList_Sidebar.ss
index 15c64942..9f6f52f8 100644
--- a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_PageList_Sidebar.ss
+++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_PageList_Sidebar.ss
@@ -1,3 +1,3 @@
-<div class="panel panel--padded panel--scrollable flexbox-area-grow fill-height cms-content-view cms-tree-view-sidebar" data-pjax-fragment="Content-PageList-Sidebar">
+<div class="panel panel--padded panel--scrollable flexbox-area-grow fill-height flexbox-display cms-content-view cms-tree-view-sidebar" data-pjax-fragment="Content-PageList-Sidebar">
 	<% include SilverStripe\\CMS\\Controllers\\CMSMain_TreeView %>
 </div>
diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSPagesController_Content.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSPagesController_Content.ss
index f9deb86a..dbef1fe9 100644
--- a/templates/SilverStripe/CMS/Controllers/Includes/CMSPagesController_Content.ss
+++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSPagesController_Content.ss
@@ -7,9 +7,8 @@
 		</div>
 	</div>
 
-	<div class="cms-content-fields center ui-widget-content cms-panel-padded flexbox-area-grow fill-height">
+	<div class="flexbox-area-grow fill-height cms-content-fields ui-widget-content cms-panel-padded">
 		$Tools
 		$PageList
 	</div>
-
 </div>