From d109992a375bc20d8d75f7c543506caf714e7592 Mon Sep 17 00:00:00 2001
From: Paul Clarke <paul@silverstripe.com>
Date: Mon, 7 Nov 2016 13:55:45 +1300
Subject: [PATCH 1/2] Safari fix for menu toggle position and bottom of menu

---
 admin/client/dist/styles/bundle.css                         | 5 +----
 admin/client/src/styles/legacy/_menu.scss                   | 5 +----
 .../SilverStripe/Admin/Includes/LeftAndMain_Menu.ss         | 6 +++---
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/admin/client/dist/styles/bundle.css b/admin/client/dist/styles/bundle.css
index d3058230c..d8c01da95 100644
--- a/admin/client/dist/styles/bundle.css
+++ b/admin/client/dist/styles/bundle.css
@@ -12044,10 +12044,6 @@ li.class-ErrorPage>a .jstree-pageicon{
   display:none;
 }
 
-.cms-menu.collapsed.cms-panel .cms-panel-content{
-  display:block;
-}
-
 .cms-menu.collapsed .cms-menu-list li a{
   padding-left:18px;
   padding-right:18px;
@@ -12062,6 +12058,7 @@ li.class-ErrorPage>a .jstree-pageicon{
   height:53px;
   background-color:#e9f0f4;
   box-shadow:inset -1px 0 0 #c1c7cc;
+  position:relative;
 }
 
 .cms-menu .cms-panel-toggle a,.cms-menu .cms-panel-toggle a.toggle-expand{
diff --git a/admin/client/src/styles/legacy/_menu.scss b/admin/client/src/styles/legacy/_menu.scss
index 82741581b..61143ce8e 100644
--- a/admin/client/src/styles/legacy/_menu.scss
+++ b/admin/client/src/styles/legacy/_menu.scss
@@ -149,10 +149,6 @@
 			}
 		}
 
-		&.cms-panel .cms-panel-content {
-			display: block; // override panel defaults
-		}
-
 		.cms-menu-list li a {
 			padding-left: 18px;
 			padding-right: 18px;
@@ -168,6 +164,7 @@
 		height: $toolbar-total-height;
 		background-color: $color-theme-bg;
 		box-shadow: inset $color-separator -1px 0 0;
+		position: relative;
 
 		a,
 		a.toggle-expand {
diff --git a/admin/templates/SilverStripe/Admin/Includes/LeftAndMain_Menu.ss b/admin/templates/SilverStripe/Admin/Includes/LeftAndMain_Menu.ss
index 6aaae4655..599c569a9 100644
--- a/admin/templates/SilverStripe/Admin/Includes/LeftAndMain_Menu.ss
+++ b/admin/templates/SilverStripe/Admin/Includes/LeftAndMain_Menu.ss
@@ -1,10 +1,10 @@
-<div class="cms-menu cms-panel cms-panel-layout" id="cms-menu" data-layout-type="border">
-	<div class="cms-logo-header north">
+<div class="fill-height cms-menu cms-panel cms-panel-layout" id="cms-menu" data-layout-type="border">
+	<div class="cms-logo-header">
 		<% include SilverStripe\\Admin\\LeftAndMain_MenuLogo %>
 		<% include SilverStripe\\Admin\\LeftAndMain_MenuStatus %>
 	</div>
 
-	<div class="panel--scrollable panel--triple-toolbar cms-panel-content">
+	<div class="flexbox-area-grow panel--scrollable panel--triple-toolbar cms-panel-content">
 		<% include SilverStripe\\Admin\\LeftAndMain_MenuList %>
 	</div>
 

From aafa448bdd79759d70ccbee1d6369a0401c8deb1 Mon Sep 17 00:00:00 2001
From: Paul Clarke <paul@silverstripe.com>
Date: Mon, 7 Nov 2016 14:08:42 +1300
Subject: [PATCH 2/2] Capitalise title

---
 .../SilverStripe/Admin/Includes/LeftAndMain_MenuToggle.ss       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/templates/SilverStripe/Admin/Includes/LeftAndMain_MenuToggle.ss b/admin/templates/SilverStripe/Admin/Includes/LeftAndMain_MenuToggle.ss
index d71d2d138..87d59aa3e 100644
--- a/admin/templates/SilverStripe/Admin/Includes/LeftAndMain_MenuToggle.ss
+++ b/admin/templates/SilverStripe/Admin/Includes/LeftAndMain_MenuToggle.ss
@@ -1,4 +1,4 @@
 <button class="sticky-toggle" type="button" title="Sticky nav">Sticky nav</button>
-<span class="sticky-status-indicator">auto</span>
+<span class="sticky-status-indicator">Auto</span>
 <a class="toggle-expand" href="#"><span>&raquo;</span></a>
 <a class="toggle-collapse" href="#"><span>&laquo;</span></a>