frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Normalise default subflow color references

Browse Source
This commit is contained in:
Nick O'Leary 2019-09-23 10:19:41 +01:00
parent 460c5a1ae3
commit 6fb6b13037
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/node_modules/@node-red/editor-client/src/js/nodes.js vendored
View File

@ -392,7 +392,7 @@ RED.nodes = (function() {
category: sf.category || "subflows", category: sf.category || "subflows",
inputs: sf.in.length, inputs: sf.in.length,
outputs: sf.out.length, outputs: sf.out.length,
color: sf.color || "#da9", color: sf.color || "#DDAA99",
label: function() { return this.name||RED.nodes.subflow(sf.id).name }, label: function() { return this.name||RED.nodes.subflow(sf.id).name },
labelStyle: function() { return this.name?"red-ui-flow-node-label-italic":""; }, labelStyle: function() { return this.name?"red-ui-flow-node-label-italic":""; },
paletteLabel: function() { return RED.nodes.subflow(sf.id).name }, paletteLabel: function() { return RED.nodes.subflow(sf.id).name },

8
packages/node_modules/@node-red/editor-client/src/js/ui/diff.js vendored
View File

@ -401,7 +401,7 @@ RED.diff = (function() {
defaults:{}, defaults:{},
icon:"subflow.svg", icon:"subflow.svg",
category: "subflows", category: "subflows",
color: "#da9" color: "#DDAA99"
}, },
tab:currentConfig.subflows[subflowId] tab:currentConfig.subflows[subflowId]
} }
@ -424,7 +424,7 @@ RED.diff = (function() {
defaults:{}, defaults:{},
icon:"subflow.svg", icon:"subflow.svg",
category: "subflows", category: "subflows",
color: "#da9" color: "#DDAA99"
}, },
tab:newConfig.subflows[subflowId], tab:newConfig.subflows[subflowId],
newTab:newConfig.subflows[subflowId] newTab:newConfig.subflows[subflowId]
@ -445,7 +445,7 @@ RED.diff = (function() {
defaults:{}, defaults:{},
icon:"subflow.svg", icon:"subflow.svg",
category: "subflows", category: "subflows",
color: "#da9" color: "#DDAA99"
}, },
tab:remoteDiff.newConfig.subflows[subflowId], tab:remoteDiff.newConfig.subflows[subflowId],
remoteTab: remoteDiff.newConfig.subflows[subflowId] remoteTab: remoteDiff.newConfig.subflows[subflowId]
@ -551,7 +551,7 @@ RED.diff = (function() {
def = { def = {
icon:"subflow.svg", icon:"subflow.svg",
category: "subflows", category: "subflows",
color: "#da9", color: "#DDAA99",
defaults:{name:{value:""}} defaults:{name:{value:""}}
} }
} else { } else {

3
packages/node_modules/@node-red/editor-client/src/js/ui/editor.js vendored
View File

@ -842,6 +842,7 @@ RED.editor = (function() {
selector.trigger("change"); selector.trigger("change");
colorButton.on("click", function (e) { colorButton.on("click", function (e) {
var recommendedColors = [ var recommendedColors = [
"#DDAA99",
"#3FADB5", "#87A980", "#A6BBCF", "#3FADB5", "#87A980", "#A6BBCF",
"#AAAA66", "#C0C0C0", "#C0DEED", "#AAAA66", "#C0C0C0", "#C0DEED",
"#C7E9C0", "#D7D7A0", "#D8BFD8", "#C7E9C0", "#D7D7A0", "#D8BFD8",
@ -989,7 +990,7 @@ RED.editor = (function() {
if (node.type === "subflow") { if (node.type === "subflow") {
// subflow template can select its color // subflow template can select its color
var color = node.color ? node.color : "#da9"; var color = node.color ? node.color : "#DDAA99";
var colorRow = $("<div/>", { var colorRow = $("<div/>", {
class: "form-row" class: "form-row"
}).appendTo(dialogForm); }).appendTo(dialogForm);