From 6fb6b13037d159cf7d47d4e2ce39fe137ce61d3a Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 23 Sep 2019 10:19:41 +0100
Subject: [PATCH] Normalise default subflow color references

---
 .../node_modules/@node-red/editor-client/src/js/nodes.js  | 2 +-
 .../@node-red/editor-client/src/js/ui/diff.js             | 8 ++++----
 .../@node-red/editor-client/src/js/ui/editor.js           | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index ef9a88074..cd2ec87fc 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -392,7 +392,7 @@ RED.nodes = (function() {
             category: sf.category || "subflows",
             inputs: sf.in.length,
             outputs: sf.out.length,
-            color: sf.color || "#da9",
+            color: sf.color || "#DDAA99",
             label: function() { return this.name||RED.nodes.subflow(sf.id).name },
             labelStyle: function() { return this.name?"red-ui-flow-node-label-italic":""; },
             paletteLabel: function() { return RED.nodes.subflow(sf.id).name },
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
index 4ebdcdce9..7c5b22f26 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
@@ -401,7 +401,7 @@ RED.diff = (function() {
                                 defaults:{},
                                 icon:"subflow.svg",
                                 category: "subflows",
-                                color: "#da9"
+                                color: "#DDAA99"
                             },
                             tab:currentConfig.subflows[subflowId]
                         }
@@ -424,7 +424,7 @@ RED.diff = (function() {
                                 defaults:{},
                                 icon:"subflow.svg",
                                 category: "subflows",
-                                color: "#da9"
+                                color: "#DDAA99"
                             },
                             tab:newConfig.subflows[subflowId],
                             newTab:newConfig.subflows[subflowId]
@@ -445,7 +445,7 @@ RED.diff = (function() {
                                     defaults:{},
                                     icon:"subflow.svg",
                                     category: "subflows",
-                                    color: "#da9"
+                                    color: "#DDAA99"
                                 },
                                 tab:remoteDiff.newConfig.subflows[subflowId],
                                 remoteTab: remoteDiff.newConfig.subflows[subflowId]
@@ -551,7 +551,7 @@ RED.diff = (function() {
                 def = {
                     icon:"subflow.svg",
                     category: "subflows",
-                    color: "#da9",
+                    color: "#DDAA99",
                     defaults:{name:{value:""}}
                 }
             } else {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index ec75f5ee4..27100c070 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -842,6 +842,7 @@ RED.editor = (function() {
         selector.trigger("change");
         colorButton.on("click", function (e) {
             var recommendedColors = [
+                "#DDAA99",
                 "#3FADB5", "#87A980", "#A6BBCF",
                 "#AAAA66", "#C0C0C0", "#C0DEED",
                 "#C7E9C0", "#D7D7A0", "#D8BFD8",
@@ -989,7 +990,7 @@ RED.editor = (function() {
 
         if (node.type === "subflow") {
             // subflow template can select its color
-            var color = node.color ? node.color : "#da9";
+            var color = node.color ? node.color : "#DDAA99";
             var colorRow = $("<div/>", {
                 class: "form-row"
             }).appendTo(dialogForm);