From e2fafa35520ec6efc9739241eb8e5597cd57504f Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 9 Sep 2015 08:26:20 +1000
Subject: [PATCH] Revert eac25c69de5d31736de727c4d9ef76d964f34f20 Toolbar no
 longer sets height 100%, tests in Chrome 45 fine

---
 modules/backend/assets/css/october.css                 | 4 ++--
 modules/backend/assets/less/controls/sidenav-tree.less | 1 -
 modules/backend/assets/less/layout/mainmenu.less       | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css
index c905ac475..61a8c574a 100644
--- a/modules/backend/assets/css/october.css
+++ b/modules/backend/assets/css/october.css
@@ -385,7 +385,7 @@
 .control-treeview ol > li.drop-target.has-subitems > div:before{background-position:0px -102px}
 }
 .sidenav-tree{width:280px;background:#34495e}
-.sidenav-tree .control-toolbar{height:auto;padding:20px 0 20px 20px}
+.sidenav-tree .control-toolbar{padding:20px 0 20px 20px}
 .sidenav-tree .control-toolbar input.form-control{border:none}
 .sidenav-tree ul{padding:0;margin:0;list-style:none}
 .sidenav-tree div.scrollbar-thumb{background:#2b3e50 !important}
@@ -619,7 +619,7 @@ body.slim-container .layout.layout-container,body.slim-container .layout .layout
 .layout.responsive-sidebar > .layout-cell:last-child .layout-absolute{position:static}
 }
 body.mainmenu-open{overflow:hidden}
-nav#layout-mainmenu.navbar{background-color:#111111;height:auto;padding:0 0 0 20px;line-height:0;white-space:nowrap}
+nav#layout-mainmenu.navbar{background-color:#111111;padding:0 0 0 20px;line-height:0;white-space:nowrap}
 nav#layout-mainmenu.navbar a{text-decoration:none}
 nav#layout-mainmenu.navbar a:focus{background:transparent}
 nav#layout-mainmenu.navbar ul{margin:0;padding:0;list-style:none;float:left;font-weight:600;white-space:nowrap;overflow:hidden}
diff --git a/modules/backend/assets/less/controls/sidenav-tree.less b/modules/backend/assets/less/controls/sidenav-tree.less
index 8c5a528ad..52fc0600a 100644
--- a/modules/backend/assets/less/controls/sidenav-tree.less
+++ b/modules/backend/assets/less/controls/sidenav-tree.less
@@ -3,7 +3,6 @@
     background: @color-sidebarnav-bg;
 
     .control-toolbar {
-        height: auto;
         padding: 20px 0 20px 20px;
 
         input.form-control {
diff --git a/modules/backend/assets/less/layout/mainmenu.less b/modules/backend/assets/less/layout/mainmenu.less
index a687cd28d..689ca95be 100644
--- a/modules/backend/assets/less/layout/mainmenu.less
+++ b/modules/backend/assets/less/layout/mainmenu.less
@@ -8,7 +8,6 @@ body.mainmenu-open {
 
 nav#layout-mainmenu.navbar {
     background-color: @color-mainmenu;
-    height: auto;
     padding: 0 0 0 20px;
     line-height: 0;
     white-space: nowrap;