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

Better node properties layout in diff table

Browse Source
This commit is contained in:
Nick O'Leary 2017-08-03 23:04:39 +01:00
parent 7368b0cefb
commit 7de1bf9d95
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
4 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/js/ui/common/editableList.js
View File

@ -82,13 +82,15 @@
that.addItem({}); that.addItem({});
}); });
} }
console.log(this.element.prop('id'));
if (this.element.css("position") === "absolute") { if (this.element.css("position") === "absolute") {
["top","left","bottom","right"].forEach(function(s) { ["top","left","bottom","right"].forEach(function(s) {
var v = that.element.css(s); var v = that.element.css(s);
if (s!=="auto" && s!=="") { if (v!=="auto" && v!=="") {
that.topContainer.css(s,v); that.topContainer.css(s,v);
that.uiContainer.css(s,"0"); that.uiContainer.css(s,"0");
that.element.css(s,'auto'); that.element.css(s,'auto');
console.log(s,v);
} }
}) })
this.element.css("position","static"); this.element.css("position","static");

8
editor/js/ui/diff.js
View File

@ -19,8 +19,8 @@ RED.diff = (function() {
} }
function buildDiffPanel() { function buildDiffPanel(container) {
var diffPanel = $('<div id="node-dialog-view-diff"><div id="node-dialog-view-diff-headers"></div><ol id="node-dialog-view-diff-diff"></ol></div>'); var diffPanel = $('<div id="node-dialog-view-diff"><div id="node-dialog-view-diff-headers"></div><ol id="node-dialog-view-diff-diff"></ol></div>').appendTo(container);
var toolbar = $('<div class="node-diff-toolbar">'+ var toolbar = $('<div class="node-diff-toolbar">'+
'<span><span id="node-diff-toolbar-resolved-conflicts"></span></span> '+ '<span><span id="node-diff-toolbar-resolved-conflicts"></span></span> '+
@ -1080,7 +1080,7 @@ RED.diff = (function() {
}, },
open: function(tray) { open: function(tray) {
var trayBody = tray.find('.editor-tray-body'); var trayBody = tray.find('.editor-tray-body');
var diffPanel = buildDiffPanel().appendTo(trayBody); var diffPanel = buildDiffPanel(trayBody);
if (remoteDiff) { if (remoteDiff) {
$("#node-diff-view-diff-merge").show(); $("#node-diff-view-diff-merge").show();
if (Object.keys(conflicts).length === 0) { if (Object.keys(conflicts).length === 0) {
@ -1120,7 +1120,7 @@ RED.diff = (function() {
if (remoteDiff !== undefined) { if (remoteDiff !== undefined) {
diffPanel.addClass('node-diff-three-way'); diffPanel.addClass('node-diff-three-way');
$('<div class="node-diff-node-entry-cell"></div><div class="node-diff-node-entry-cell" data-i18n="diff.local"></div><div class="node-diff-node-entry-cell" data-i18n="diff.remote"></div>').i18n().appendTo("#node-dialog-view-diff-headers"); $('<div data-i18n="diff.local"></div><div data-i18n="diff.remote"></div>').i18n().appendTo("#node-dialog-view-diff-headers");
el.remoteTab = { el.remoteTab = {
n:{}, n:{},
nodes:remoteDiff.newConfig.globals nodes:remoteDiff.newConfig.globals

43
editor/sass/diff.scss
View File

@ -33,7 +33,6 @@
border: none; border: none;
min-height: 0; min-height: 0;
} }
} }
.red-ui-editableList-item-content { .red-ui-editableList-item-content {
padding: 5px; padding: 5px;
@ -42,19 +41,23 @@
} }
#node-dialog-view-diff-headers { #node-dialog-view-diff-headers {
position: absolute; position: absolute;
left:17px; left:237px;
right:32px; right:18px;
top: 55px; top: 55px;
height: 25px; height: 25px;
.node-diff-node-entry-cell:not(:first-child) { div {
height: 25px;
display: inline-block;
box-sizing: border-box;
width: 50%;
background: #f9f9f9; background: #f9f9f9;
text-align: center; text-align: center;
border-top: 1px solid $secondary-border-color; border-top: 1px solid $secondary-border-color;
border-color:$secondary-border-color; border-color:$secondary-border-color;
border-left: 1px solid $secondary-border-color;
} }
.node-diff-node-entry-cell:last-child { div:last-child {
border-right: 1px solid $secondary-border-color; border-right: 1px solid $secondary-border-color;
} }
} }
@ -104,10 +107,10 @@
font-size: 0.9em; font-size: 0.9em;
&:first-child { &:first-child {
border-top: 1px solid #eee; border-top: 1px solid $secondary-border-color;
} }
&:not(:last-child) { &:not(:last-child) {
border-bottom: 1px solid #eee; border-bottom: 1px solid $secondary-border-color;
} }
&.collapsed { &.collapsed {
@ -130,10 +133,21 @@
table { table {
border-collapse: collapse; border-collapse: collapse;
table-layout:fixed; table-layout:fixed;
width: calc(100% - 20px);
margin-left: 20px;
}
col:first-child {
width: 180px;
}
col:not(:first-child) {
width: 100%; width: 100%;
} }
td, th { td, th {
border: 1px solid $secondary-border-color; border-top: 1px solid #f3f3f3;
border-left: 1px solid $secondary-border-color;
&:first-child {
border-left: none;
}
padding: 0 0 0 3px; padding: 0 0 0 3px;
text-align: left; text-align: left;
overflow-x: auto; overflow-x: auto;
@ -149,12 +163,7 @@
} }
} }
col:first-child {
width: 140px;
}
col:not(:first-child) {
width: 100%;
}
td { td {
.node-diff-status { .node-diff-status {
margin-left: 0; margin-left: 0;
@ -308,7 +317,7 @@
} }
} }
.node-diff-node-entry-properties { .node-diff-node-entry-properties {
margin: 5px ; margin: 0;
color: #666; color: #666;
} }
.node-diff-status { .node-diff-status {
@ -357,7 +366,7 @@
box-sizing: border-box; box-sizing: border-box;
width: calc( (100% - 20px) / 2); width: calc( (100% - 20px) / 2);
height: 32px; height: 32px;
border-left: 1px solid #eee; border-left: 1px solid $secondary-border-color;
padding-top: 2px; padding-top: 2px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;

4
red/api/locales/en-US/editor.json
View File

@ -167,8 +167,8 @@
}, },
"nodeCount": "__count__ node", "nodeCount": "__count__ node",
"nodeCount_plural": "__count__ nodes", "nodeCount_plural": "__count__ nodes",
"local":"Local", "local":"Local changes",
"remote":"Remote" "remote":"Remote changes"
}, },
"subflow": { "subflow": {