From 96964be39d3c9e1f14b238c4d714b07d83f70aab Mon Sep 17 00:00:00 2001
From: Paul Clarke <paul@silverstripe.com>
Date: Thu, 20 Oct 2016 16:19:19 +1300
Subject: [PATCH] Sitetree scroll moved so whole area scrolls excluding actions

---
 admin/client/dist/styles/bundle.css        | 20 ++++++++++++++++----
 admin/client/src/styles/legacy/_style.scss | 15 +++++++--------
 admin/client/src/styles/legacy/_tree.scss  | 12 ++++++++++++
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/admin/client/dist/styles/bundle.css b/admin/client/dist/styles/bundle.css
index c90c61308..38657011b 100644
--- a/admin/client/dist/styles/bundle.css
+++ b/admin/client/dist/styles/bundle.css
@@ -9484,7 +9484,7 @@ body.cms{
 
 .view-controls{
   float:right;
-  margin-top:4px;
+  margin-top:5px;
 }
 
 .view-controls .icon-button-group .icon-button{
@@ -9575,8 +9575,6 @@ body.cms{
 }
 
 .cms a.icon-button.font-icon-search.active,.cms a.icon-button.font-icon-search:active,.cms a.icon-button.font-icon-search:focus,.cms a.icon-button.font-icon-search:hover,.cms button.ss-ui-button.icon-button.font-icon-search.active,.cms button.ss-ui-button.icon-button.font-icon-search:active,.cms button.ss-ui-button.icon-button.font-icon-search:focus,.cms button.ss-ui-button.icon-button.font-icon-search:hover{
-  background:none;
-  box-shadow:none;
   color:#4f5861;
 }
 
@@ -10644,7 +10642,12 @@ form.member-profile-form #Permissions .optionset li{
   margin-top:-5px;
 }
 
-.cms .cms-panel-padded .cms-content-view,.CMSPageAddController .cms-panel-padded{
+.cms .cms-panel-padded .cms-content-view{
+  padding:1.5385rem;
+  height:100%;
+}
+
+.CMSPageAddController .cms-panel-padded{
   padding:1.5385rem;
 }
 
@@ -11678,6 +11681,15 @@ form.small .cms-file-info-data .field .middleColumn{
   display:block;
 }
 
+.cms-tree-holder{
+  overflow-x:auto;
+  height:calc(100% - 13px);
+  padding-left:20px;
+  padding-right:20px;
+  margin-left:-20px;
+  margin-right:-20px;
+}
+
 .jstree-apple a .jstree-icon,.jstree-classic a .jstree-icon,.jstree-default-rtl a .jstree-icon,.jstree-default a .jstree-icon{
   background-position:-60px -19px;
 }
diff --git a/admin/client/src/styles/legacy/_style.scss b/admin/client/src/styles/legacy/_style.scss
index 0ce98079e..511b92996 100644
--- a/admin/client/src/styles/legacy/_style.scss
+++ b/admin/client/src/styles/legacy/_style.scss
@@ -215,15 +215,15 @@ body.cms {
     font-weight: normal;
   }
 
-	.breadcrumbs-wrapper {
-		float: left;
-		padding-top: $spacer-xs / 2;
-	}
+  .breadcrumbs-wrapper {
+    float: left;
+    padding-top: $spacer-xs / 2;
+  }
 }
 
 .view-controls {
   float: right;
-  margin-top: 4px;
+  margin-top: 5px;
 
   .icon-button-group {
     .icon-button {
@@ -348,8 +348,6 @@ body.cms {
       &:active,
       &:focus,
       &:hover {
-        background: none;
-        box-shadow: none;
         color: darken($color-text, 10%);
       }
 
@@ -1586,7 +1584,8 @@ form.member-profile-form {
 }
 
 .cms .cms-panel-padded .cms-content-view {
-	padding: $panel-padding-y $panel-padding-x;
+  padding: $panel-padding-y $panel-padding-x;
+  height: 100%; // For horizontal scrollbar on Pages sitetree at smaller sizes
 }
 
 .CMSPageAddController .cms-panel-padded {
diff --git a/admin/client/src/styles/legacy/_tree.scss b/admin/client/src/styles/legacy/_tree.scss
index 145dd2b34..280c84730 100644
--- a/admin/client/src/styles/legacy/_tree.scss
+++ b/admin/client/src/styles/legacy/_tree.scss
@@ -600,6 +600,18 @@
 	}
 }
 
+
+// Scroll horizontal for sitetree
+// so scrollbar is fixed to bottom of panel, and tree actions remain fixed at top
+.cms-tree-holder {
+	overflow-x: auto;
+	height: calc(100% - 13px); // Magic number, need to investigate why its needed (possibly scroll bar height)
+	padding-left: 20px;
+	padding-right: 20px;
+	margin-left: -20px;
+	margin-right: -20px;
+}
+
 // Override thirdparty themes
 .jstree-default a .jstree-icon,
 .jstree-default-rtl a .jstree-icon,