From 5df797b70554fab80b5e9c49ae95ee599e7e7965 Mon Sep 17 00:00:00 2001
From: Paul Clarke <paul@silverstripe.com>
Date: Fri, 28 Oct 2016 15:09:44 +1300
Subject: [PATCH] Toolbar-content to be flexible

---
 admin/client/dist/styles/bundle.css              | 2 ++
 admin/client/src/components/Toolbar/Toolbar.scss | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/admin/client/dist/styles/bundle.css b/admin/client/dist/styles/bundle.css
index 9896f18b6..3c09fb85b 100644
--- a/admin/client/dist/styles/bundle.css
+++ b/admin/client/dist/styles/bundle.css
@@ -15444,6 +15444,7 @@ div.grid-field__sort-field+.form__fieldgroup-item{
   margin-right:auto;
   padding-left:1.5385rem;
   padding-right:1.5385rem;
+  min-height:53px;
 }
 
 .toolbar--content .btn-toolbar,.toolbar--north .btn-toolbar,.toolbar--south .btn-toolbar,.toolbar .btn-toolbar{
@@ -15473,6 +15474,7 @@ div.grid-field__sort-field+.form__fieldgroup-item{
   margin-left:-1.5385rem;
   margin-right:-1.5385rem;
   padding:.76925rem;
+  min-height:auto;
 }
 
 @media (max-width:991px){
diff --git a/admin/client/src/components/Toolbar/Toolbar.scss b/admin/client/src/components/Toolbar/Toolbar.scss
index 1c1dd2a7d..6c75d6468 100644
--- a/admin/client/src/components/Toolbar/Toolbar.scss
+++ b/admin/client/src/components/Toolbar/Toolbar.scss
@@ -3,6 +3,7 @@
 .toolbar--content,
 .toolbar--south {
   @include make-container();
+  min-height: $toolbar-total-height;
 
   .btn-toolbar {
     // TODO Remove '.cms .btn-toolbar' override
@@ -40,6 +41,7 @@
   margin-left: -$panel-padding-x;
   margin-right: -$panel-padding-x;
   padding: $spacer-xs;
+  min-height: auto;
 
 
   @include media-breakpoint-down(md) {