From 0f39001e46e94ab01fb8cbb4a537648d530d6942 Mon Sep 17 00:00:00 2001
From: Janneke Janssen <j.janssen@lukkien.com>
Date: Tue, 28 Feb 2017 21:15:06 +0100
Subject: [PATCH] Fixes hallotoolbar misplacement within StreamField
 StructBlock

---
 .../wagtailadmin/static_src/wagtailadmin/js/hallo-bootstrap.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-bootstrap.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-bootstrap.js
index a3e94ef4c..7af277403 100644
--- a/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-bootstrap.js
+++ b/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-bootstrap.js
@@ -27,10 +27,11 @@ function makeHalloRichTextEditable(id) {
     }
 
     var closestObj = input.closest('.object');
+    var isDeepNested = input.closest('.struct-block').length;
 
     richText.hallo({
         toolbar: 'halloToolbarFixed',
-        toolbarCssClass: (closestObj.hasClass('full')) ? 'full' : (closestObj.hasClass('stream-field')) ? 'stream-field' : '',
+        toolbarCssClass: (closestObj.hasClass('full')) ? 'full' : (closestObj.hasClass('stream-field') && !isDeepNested) ? 'stream-field' : '',
         plugins: halloPlugins
     }).bind('hallomodified', function(event, data) {
         input.val(data.content);