From 9c4640e010e8d7644e010292e12fbab6564efe8c Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Wed, 1 Jan 2020 21:32:56 +0000
Subject: [PATCH] Make min-height for change, switch, batch and mqtt consistent

to allow fit to smaller screens before scrolling
(to fix comment from forum)
---
 .../@node-red/nodes/core/function/10-switch.html            | 5 +++--
 .../@node-red/nodes/core/function/15-change.html            | 6 +++---
 .../node_modules/@node-red/nodes/core/network/10-mqtt.html  | 4 ++--
 .../@node-red/nodes/core/sequence/19-batch.html             | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.html b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
index 9f072ad8a..6524a1030 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="switch">
+<script type="text/html" data-template-name="switch">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
@@ -173,7 +173,7 @@
                 }
             }
 
-            $("#node-input-rule-container").css('min-height','250px').css('min-width','450px').editableList({
+            $("#node-input-rule-container").css('min-height','150px').css('min-width','450px').editableList({
                 addItem: function(container,i,opt) {
                     if (!opt.hasOwnProperty('r')) {
                         opt.r = {};
@@ -453,6 +453,7 @@
             }
             var editorRow = $("#dialog-form>div.node-input-rule-container-row");
             height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
+            height += 16;
             $("#node-input-rule-container").editableList('height',height);
         }
     });
diff --git a/packages/node_modules/@node-red/nodes/core/function/15-change.html b/packages/node_modules/@node-red/nodes/core/function/15-change.html
index 5df7f9a6c..fc9fa8d84 100644
--- a/packages/node_modules/@node-red/nodes/core/function/15-change.html
+++ b/packages/node_modules/@node-red/nodes/core/function/15-change.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="change">
+<script type="text/html" data-template-name="change">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
@@ -81,7 +81,7 @@
                 rule.find('.red-ui-typedInput').typedInput("width",newWidth-130);
 
             }
-            $('#node-input-rule-container').css('min-height','300px').css('min-width','450px').editableList({
+            $('#node-input-rule-container').css('min-height','150px').css('min-width','450px').editableList({
                 addItem: function(container,i,opt) {
                     var rule = opt;
                     if (!rule.hasOwnProperty('t')) {
@@ -259,7 +259,7 @@
             }
             var editorRow = $("#dialog-form>div.node-input-rule-container-row");
             height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
-
+            height += 16;
             $("#node-input-rule-container").editableList('height',height);
         }
     });
diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
index cdafab9ce..91b3d8c6e 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -129,7 +129,7 @@
     });
 </script>
 
-<script type="text/x-red" data-template-name="mqtt-broker">
+<script type="text/html" data-template-name="mqtt-broker">
     <div class="form-row">
         <label for="node-config-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-config-input-name" data-i18n="[placeholder]common.label.name">
@@ -137,7 +137,7 @@
     <div class="form-row">
         <ul style="min-width: 600px; margin-bottom: 20px;" id="node-config-mqtt-broker-tabs"></ul>
     </div>
-    <div id="node-config-mqtt-broker-tabs-content" style="min-height: 170px;">
+    <div id="node-config-mqtt-broker-tabs-content" style="min-height:150px;">
         <div id="mqtt-broker-tab-connection" style="display:none">
             <div class="form-row node-input-broker">
                 <label for="node-config-input-broker"><i class="fa fa-globe"></i> <span data-i18n="mqtt.label.broker"></span></label>
diff --git a/packages/node_modules/@node-red/nodes/core/sequence/19-batch.html b/packages/node_modules/@node-red/nodes/core/sequence/19-batch.html
index 5781ffbe5..f3cb47a54 100644
--- a/packages/node_modules/@node-red/nodes/core/sequence/19-batch.html
+++ b/packages/node_modules/@node-red/nodes/core/sequence/19-batch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="batch">
+<script type="text/html" data-template-name="batch">
     <div class="form-row">
         <label for="node-input-mode"><span data-i18n="batch.mode.label"></span></label>
         <select type="text" id="node-input-mode" style="width: 300px;">
@@ -99,7 +99,7 @@
             }
 
             $("#node-input-topics-container")
-                .css('min-height','200px').css('min-width','430px')
+                .css('min-height','150px').css('min-width','430px')
                 .editableList({
                     addItem: function(container, i, opt) {
                         if (!opt.hasOwnProperty('topic')) {