From 1e25637acb37a58c39806c76b818a9db537123e1 Mon Sep 17 00:00:00 2001
From: Jeremy Bridson <jeremy@silverstripe.com>
Date: Wed, 18 Apr 2012 13:36:15 +1200
Subject: [PATCH] ENHANCEMENT:Trac#7166 - styled the new combined tree and edit
 view.

---
 css/screen.css     |  5 ++++-
 scss/_CMSMain.scss | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/css/screen.css b/css/screen.css
index 6bf66453..7f5225ec 100644
--- a/css/screen.css
+++ b/css/screen.css
@@ -13,8 +13,11 @@
 /** -------------------------------------------- Tree View (collapsed for sidebar) -------------------------------------------- */
 #cms-content-treeview .cms-tree-expand-trigger { display: none; }
 
+.cms-content-tools #cms-content-treeview .cms-content-toolbar { border-bottom: none; box-shadow: none; margin-bottom: 8px; }
+.cms-content-tools #cms-content-treeview .cms-content-toolbar .cms-page-add-button { margin-top: 8px; }
 .cms-content-tools #cms-content-treeview .cms-tree-view-modes, .cms-content-tools #cms-content-treeview .cms-content-batchactions { display: none; }
-.cms-content-tools #cms-content-treeview .cms-tree-expand-trigger { display: inline-block; }
+.cms-content-tools #cms-content-treeview .cms-tree-expand-trigger { display: inline-block; margin: 0 0 2px 0; position: absolute; top: 8px; right: 4px; }
+.cms-content-tools #cms-content-treeview .cms-tree-expand-trigger span.ui-button-text { padding-right: 8px; }
 .cms-content-tools #cms-content-treeview .cms-tree .badge, .cms-content-tools #cms-content-treeview .cms-tree a > .jstree-icon { display: none; }
 
 .cms .AssetAdmin .cms-content-fields { overflow: hidden; }
diff --git a/scss/_CMSMain.scss b/scss/_CMSMain.scss
index f0524d5a..69ff0e2e 100644
--- a/scss/_CMSMain.scss
+++ b/scss/_CMSMain.scss
@@ -55,12 +55,27 @@
 
 .cms-content-tools { // Hide certain elements when shown in "sidebar mode"
 	#cms-content-treeview {
+		.cms-content-toolbar {
+			border-bottom:none;
+			box-shadow:none;
+			margin-bottom:8px;
+			.cms-page-add-button {
+				margin-top:8px;
+			}
+		}
 		.cms-tree-view-modes,
 		.cms-content-batchactions {
 			display: none;
 		}
 		.cms-tree-expand-trigger {
-			display: inline-block; 
+			display: inline-block;
+			margin:0 0 2px 0;
+			position:absolute;
+			top:8px;
+			right:4px;
+			span.ui-button-text{
+					padding-right:8px;
+			}
 		}
 
 		.cms-tree {