1
0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00

Better CSS namespace of base form elements

This commit is contained in:
Nick O'Leary 2019-05-09 19:22:40 +01:00
parent 59093f1721
commit 4418f8bfce
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
37 changed files with 1018 additions and 912 deletions

View File

@ -578,6 +578,8 @@ var RED = (function() {
options.apiRootUrl = options.apiRootUrl+"/";
}
options.target = $("#red-ui-editor");
options.target.addClass("red-ui-editor");
buildEditor(options);
RED.i18n.init(options, function() {
RED.settings.init(options, loadEditor);

View File

@ -28,13 +28,18 @@ RED.clipboard = (function() {
var libraryBrowser;
function setupDialogs() {
dialog = $('<div id="red-ui-clipboard-dialog" class="hide node-red-dialog"><form class="dialog-form form-horizontal"></form></div>')
dialog = $('<div id="red-ui-clipboard-dialog" class="hide"><form class="dialog-form form-horizontal"></form></div>')
.appendTo("#red-ui-editor")
.dialog({
modal: true,
autoOpen: false,
width: 700,
resizable: false,
classes: {
"ui-dialog": "red-ui-editor-dialog",
"ui-dialog-titlebar-close": "hide",
"ui-widget-overlay": "red-ui-editor-dialog"
},
buttons: [
{
id: "red-ui-clipboard-dialog-cancel",
@ -148,9 +153,6 @@ RED.clipboard = (function() {
}
}
],
open: function(e) {
$(this).parent().find(".ui-dialog-titlebar-close").hide();
},
close: function(e) {
if (popover) {
popover.close(true);
@ -171,7 +173,7 @@ RED.clipboard = (function() {
'</span>'+
'</div>'+
'<div style="height: 400px; position:relative; border:1px solid #999;">'+
'<div style="position: absolute; top:0;left:0;bottom:0;width:120px;background: #f3f3f3;">'+
'<div class="red-ui-clipboard-dialog-tabs">'+
'<ul id="red-ui-clipboard-dialog-export-tabs"></ul>'+
'</div>'+
'<div id="red-ui-clipboard-dialog-export-tabs-content" class="red-ui-clipboard-dialog-tabs-content">'+
@ -199,7 +201,7 @@ RED.clipboard = (function() {
importNodesDialog =
'<div style="height: 400px; position:relative; border:1px solid #999; margin-bottom: 12px">'+
'<div style="position: absolute; top:0;left:0;bottom:0;width:120px;background: #f3f3f3;">'+
'<div class="red-ui-clipboard-dialog-tabs">'+
'<ul id="red-ui-clipboard-dialog-import-tabs"></ul>'+
'</div>'+
'<div id="red-ui-clipboard-dialog-import-tabs-content" class="red-ui-clipboard-dialog-tabs-content">'+

View File

@ -35,6 +35,7 @@
this.currentTimeout = null;
this.lastSent = "";
this.element.val("");
this.element.addClass("red-ui-searchBox-input");
this.uiContainer = this.element.wrap("<div>").parent();
this.uiContainer.addClass("red-ui-searchBox-container");

View File

@ -276,7 +276,7 @@
}
if (item.hasOwnProperty('selected')) {
var selectWrapper = $('<span class="red-ui-treeList-icon"></span>').appendTo(label);
var cb = $('<input type="checkbox">').prop('checked',item.selected).appendTo(selectWrapper);
var cb = $('<input class="red-ui-treeList-checkbox" type="checkbox">').prop('checked',item.selected).appendTo(selectWrapper);
cb.on('click', function(e) {
e.stopPropagation();
});

View File

@ -124,7 +124,7 @@
}
var contextStores = RED.settings.context.stores;
var contextOptions = contextStores.map(function(store) {
return {value:store,label: store, icon:'<i class="red-ui-typedInput-icon fa fa-database" style="color: #'+(store==='memory'?'ddd':'777')+'"></i>'}
return {value:store,label: store, icon:'<i class="red-ui-typedInput-icon fa fa-database"></i>'}
})
if (contextOptions.length < 2) {
allOptions.flow.options = [];
@ -138,12 +138,12 @@
var that = this;
this.disarmClick = false;
this.input = $('<input type="text"></input>');
this.input = $('<input class="red-ui-typedInput-input" type="text"></input>');
this.input.insertAfter(this.element);
this.input.val(this.element.val());
this.element.addClass('red-ui-typedInput');
this.uiWidth = this.element.outerWidth();
this.elementDiv = this.input.wrap("<div>").parent().addClass('red-ui-typedInput-input');
this.elementDiv = this.input.wrap("<div>").parent().addClass('red-ui-typedInput-input-wrap');
this.uiSelect = this.elementDiv.wrap( "<div>" ).parent();
var attrStyle = this.element.attr('style');
var m;
@ -171,7 +171,7 @@
this.options.types = this.options.types||Object.keys(allOptions);
this.selectTrigger = $('<button tabindex="0"></button>').prependTo(this.uiSelect);
this.selectTrigger = $('<button class="red-ui-typedInput-type-select" tabindex="0"></button>').prependTo(this.uiSelect);
$('<i class="red-ui-typedInput-icon fa fa-sort-desc"></i>').toggle(this.options.types.length > 1).appendTo(this.selectTrigger);
this.selectLabel = $('<span class="red-ui-typedInput-type-label"></span>').appendTo(this.selectTrigger);
@ -363,7 +363,6 @@
var container = $('<div class="red-ui-typedInput-container"></div>').css({
position:"absolute",
top:0,
left:-1000
}).appendTo(document.body);
var newTrigger = label.clone().appendTo(container);
labelWidth = newTrigger.outerWidth();

View File

@ -1029,9 +1029,9 @@ RED.diff = (function() {
}
var localSelectDiv = $('<label>',{class:"red-ui-diff-selectbox",for:safeNodeId+"-local"}).on("click", function(e) { e.stopPropagation();}).appendTo(localDiv);
var localRadio = $('<input>',{id:safeNodeId+"-local",type:'radio',value:"local",name:safeNodeId,class:className+"-local"+(titleRow?"":" node-diff-select-node")}).data('node-id',node.id).on("change", changeHandler).appendTo(localSelectDiv);
var localRadio = $('<input>',{class:"red-ui-diff-selectbox-input",id:safeNodeId+"-local",type:'radio',value:"local",name:safeNodeId,class:className+"-local"+(titleRow?"":" node-diff-select-node")}).data('node-id',node.id).on("change", changeHandler).appendTo(localSelectDiv);
var remoteSelectDiv = $('<label>',{class:"red-ui-diff-selectbox",for:safeNodeId+"-remote"}).on("click", function(e) { e.stopPropagation();}).appendTo(remoteDiv);
var remoteRadio = $('<input>',{id:safeNodeId+"-remote",type:'radio',value:"remote",name:safeNodeId,class:className+"-remote"+(titleRow?"":" node-diff-select-node")}).data('node-id',node.id).on("change", changeHandler).appendTo(remoteSelectDiv);
var remoteRadio = $('<input>',{class:"red-ui-diff-selectbox-input",id:safeNodeId+"-remote",type:'radio',value:"remote",name:safeNodeId,class:className+"-remote"+(titleRow?"":" node-diff-select-node")}).data('node-id',node.id).on("change", changeHandler).appendTo(remoteSelectDiv);
if (state === 'local') {
localRadio.prop('checked',true);
} else if (state === 'remote') {

View File

@ -433,6 +433,11 @@ RED.library = (function() {
autoOpen: false,
width: 800,
resizable: false,
classes: {
"ui-dialog": "red-ui-editor-dialog",
"ui-dialog-titlebar-close": "hide",
"ui-widget-overlay": "red-ui-editor-dialog"
},
buttons: [
{
text: RED._("common.label.cancel"),
@ -449,10 +454,7 @@ RED.library = (function() {
$( this ).dialog( "close" );
}
}
],
open: function(e) {
$(this).parent().find(".ui-dialog-titlebar-close").hide();
}
]
});
saveLibraryBrowser = RED.library.createBrowser({

View File

@ -235,12 +235,7 @@ RED.palette.editor = (function() {
if (def && def.color) {
swatch.css({background:RED.utils.getNodeColor(t,def)});
swatch.css({border: "1px solid "+getContrastingBorder(swatch.css('backgroundColor'))})
} else {
swatch.css({background:"#eee",border:"1px dashed #999"})
}
} else {
swatch.css({background:"#eee",border:"1px dashed #999"})
}
}
nodeEntries[module].setUseCount[setName] = inUseCount;

View File

@ -535,6 +535,7 @@ RED.palette = (function() {
sidebarControls.toggle("slide", { direction: "left" }, 200);
})
$("#red-ui-palette").on("mouseleave", function() {
sidebarControls.stop(false,true);
sidebarControls.hide();
})

View File

@ -231,7 +231,7 @@ RED.projects.settings = (function() {
var pane = $('<div id="red-ui-project-settings-tab-main" class="red-ui-project-settings-tab-pane node-help"></div>');
$('<h1>').text(activeProject.name).appendTo(pane);
var summary = $('<div style="position: relative">').appendTo(pane);
var summaryContent = $('<div></div>',{style:"color: #999"}).appendTo(summary);
var summaryContent = $('<div></div>').appendTo(summary);
updateProjectSummary(activeProject.summary, summaryContent);
if (RED.user.hasPermission("projects.write")) {
$('<button class="editor-button editor-button-small" style="float: right;">' + RED._('sidebar.project.editDescription') + '</button>')

View File

@ -27,7 +27,7 @@ RED.projects.userSettings = (function() {
var title = $('<h3></h3>').text(RED._("editor:sidebar.project.userSettings.committerDetail")).appendTo(pane);
var gitconfigContainer = $('<div class="red-ui-settings-section"></div>').appendTo(pane);
$('<div style="color:#aaa;"></div>').appendTo(gitconfigContainer).text(RED._("editor:sidebar.project.userSettings.committerTip"));
$('<div class="red-ui-settings-section-description"></div>').appendTo(gitconfigContainer).text(RED._("editor:sidebar.project.userSettings.committerTip"));
var row = $('<div class="red-ui-settings-row"></div>').appendTo(gitconfigContainer);
$('<label for=""></label>').text(RED._("editor:sidebar.project.userSettings.userName")).appendTo(row);
@ -45,7 +45,7 @@ RED.projects.userSettings = (function() {
var container = $('<div class="red-ui-settings-section"></div>').appendTo(pane);
var popover;
var title = $('<h3></h3>').text(RED._("editor:sidebar.project.userSettings.sshKeys")).appendTo(container);
var subtitle = $('<div style="color:#aaa;"></div>').appendTo(container).text(RED._("editor:sidebar.project.userSettings.sshKeysTip"));
var subtitle = $('<div class="red-ui-settings-section-description"></div>').appendTo(container).text(RED._("editor:sidebar.project.userSettings.sshKeysTip"));
var addKeyButton = $('<button id="user-settings-gitconfig-add-key" class="editor-button editor-button-small" style="float: right; margin-right: 10px;">'+RED._("editor:sidebar.project.userSettings.add")+'</button>')
.appendTo(subtitle)
@ -95,7 +95,7 @@ RED.projects.userSettings = (function() {
var addKeyDialogBody = $('<div>').appendTo(addKeyDialog);
row = $('<div class="red-ui-settings-row"></div>').appendTo(addKeyDialogBody);
$('<div style="color:#aaa;"></div>').appendTo(row).text(RED._("editor:sidebar.project.userSettings.addSshKeyTip"));
$('<div class="red-ui-settings-section-description"></div>').appendTo(row).text(RED._("editor:sidebar.project.userSettings.addSshKeyTip"));
// var bg = $('<div></div>',{class:"button-group", style:"text-align: center"}).appendTo(row);
// var addLocalButton = $('<button class="editor-button toggle selected">use local key</button>').appendTo(bg);
// var uploadButton = $('<button class="editor-button toggle">upload key</button>').appendTo(bg);

View File

@ -852,14 +852,14 @@ RED.projects = (function() {
var row = $('<div class="form-row red-ui-projects-dialog-screen-create-row red-ui-projects-dialog-screen-create-row-empty"></div>').appendTo(body);
$('<label>'+RED._("projects.encryption-config.credentials")+'</label>').appendTo(row);
var credentialsBox = $('<div style="width: 550px">').appendTo(row);
var credentialsRightBox = $('<div style="min-height:150px; box-sizing: border-box; float: right; vertical-align: top; width: 331px; margin-left: -1px; padding: 15px; margin-top: -15px; border: 1px solid #ccc; border-radius: 3px; display: inline-block">').appendTo(credentialsBox);
var credentialsLeftBox = $('<div style="vertical-align: top; width: 220px; display: inline-block">').appendTo(credentialsBox);
var credentialsBox = $('<div class="red-ui-projects-dialog-credentials-box">').appendTo(row);
var credentialsRightBox = $('<div class="red-ui-projects-dialog-credentials-box-right">').appendTo(credentialsBox);
var credentialsLeftBox = $('<div class="red-ui-projects-dialog-credentials-box-left">').appendTo(credentialsBox);
var credentialsEnabledBox = $('<div class="form-row" style="padding: 7px 8px 3px 8px;border: 1px solid #ccc;border-radius: 4px;border-top-right-radius: 0;border-bottom-right-radius: 0;border-right-color: white;"></div>').appendTo(credentialsLeftBox);
$('<label class="red-ui-projects-edit-form-inline-label" style="margin-left: 5px"><input type="radio" style="vertical-align: middle; margin-top:0; margin-right: 10px;" name="projects-encryption-type" value="enabled"> <i style="font-size: 1.4em; margin-right: 8px; vertical-align: middle; color: #888;" class="fa fa-lock"></i> <span style="vertical-align: middle;">'+RED._("projects.encryption-config.enable")+'</span></label>').appendTo(credentialsEnabledBox);
var credentialsDisabledBox = $('<div class="form-row" style="padding: 7px 8px 3px 8px;border: 1px solid white;border-radius: 4px;border-top-right-radius: 0;border-bottom-right-radius: 0;border-right-color: #ccc; "></div>').appendTo(credentialsLeftBox);
$('<label class="red-ui-projects-edit-form-inline-label" style="margin-left: 5px"><input type="radio" style="vertical-align: middle; margin-top:0; margin-right: 10px;" name="projects-encryption-type" value="disabled"> <i style="font-size: 1.4em; margin-right: 8px; vertical-align: middle; color: #888;" class="fa fa-unlock"></i> <span style="vertical-align: middle;">'+RED._("projects.encryption-config.disable")+'</span></label>').appendTo(credentialsDisabledBox);
var credentialsEnabledBox = $('<div class="form-row red-ui-projects-dialog-credentials-box-enabled"></div>').appendTo(credentialsLeftBox);
$('<label class="red-ui-projects-edit-form-inline-label"><input type="radio" name="projects-encryption-type" value="enabled"> <i class="fa fa-lock"></i> <span>'+RED._("projects.encryption-config.enable")+'</span></label>').appendTo(credentialsEnabledBox);
var credentialsDisabledBox = $('<div class="form-row red-ui-projects-dialog-credentials-box-disabled"></div>').appendTo(credentialsLeftBox);
$('<label class="red-ui-projects-edit-form-inline-label"><input type="radio" name="projects-encryption-type" value="disabled"> <i class="fa fa-unlock"></i> <span>'+RED._("projects.encryption-config.disable")+'</span></label>').appendTo(credentialsDisabledBox);
credentialsLeftBox.find("input[name=projects-encryption-type]").on("click", function(e) {
var val = $(this).val();
@ -881,15 +881,8 @@ RED.projects = (function() {
$(".projects-encryption-disabled-row").show();
}
toEnable.css({
borderColor: "#ccc",
borderRightColor: "white"
});
toDisable.css({
borderColor: "white",
borderRightColor: "#ccc"
});
toEnable.removeClass("disabled");
toDisable.addClass("disabled");
validateForm();
})
@ -1266,14 +1259,14 @@ RED.projects = (function() {
row = $('<div class="form-row red-ui-projects-dialog-screen-create-row red-ui-projects-dialog-screen-create-row-empty"></div>').appendTo(container);
$('<label>'+RED._("projects.create.credentials")+'</label>').appendTo(row);
var credentialsBox = $('<div style="width: 550px">').appendTo(row);
var credentialsRightBox = $('<div style="min-height:150px; box-sizing: border-box; float: right; vertical-align: top; width: 331px; margin-left: -1px; padding: 15px; margin-top: -15px; border: 1px solid #ccc; border-radius: 3px; display: inline-block">').appendTo(credentialsBox);
var credentialsLeftBox = $('<div style="vertical-align: top; width: 220px; display: inline-block">').appendTo(credentialsBox);
var credentialsBox = $('<div class="red-ui-projects-dialog-credentials-box">').appendTo(row);
var credentialsRightBox = $('<div class="red-ui-projects-dialog-credentials-box-right">').appendTo(credentialsBox);
var credentialsLeftBox = $('<div class="red-ui-projects-dialog-credentials-box-left">').appendTo(credentialsBox);
var credentialsEnabledBox = $('<div class="form-row" style="padding: 7px 8px 3px 8px;border: 1px solid #ccc;border-radius: 4px;border-top-right-radius: 0;border-bottom-right-radius: 0;border-right-color: white;"></div>').appendTo(credentialsLeftBox);
$('<label class="red-ui-projects-edit-form-inline-label" style="margin-left: 5px"><input type="radio" checked style="vertical-align: middle; margin-top:0; margin-right: 10px;" name="projects-encryption-type" value="enabled"> <i style="font-size: 1.4em; margin-right: 8px; vertical-align: middle; color: #888;" class="fa fa-lock"></i> <span style="vertical-align: middle;">'+RED._("projects.create.enable-encryption")+'</span></label>').appendTo(credentialsEnabledBox);
var credentialsDisabledBox = $('<div class="form-row" style="padding: 7px 8px 3px 8px;border: 1px solid white;border-radius: 4px;border-top-right-radius: 0;border-bottom-right-radius: 0;border-right-color: #ccc; "></div>').appendTo(credentialsLeftBox);
$('<label class="red-ui-projects-edit-form-inline-label" style="margin-left: 5px"><input type="radio" style="vertical-align: middle; margin-top:0; margin-right: 10px;" name="projects-encryption-type" value="disabled"> <i style="font-size: 1.4em; margin-right: 8px; vertical-align: middle; color: #888;" class="fa fa-unlock"></i> <span style="vertical-align: middle;">'+RED._("projects.create.disable-encryption")+'</span></label>').appendTo(credentialsDisabledBox);
var credentialsEnabledBox = $('<div class="form-row red-ui-projects-dialog-credentials-box-enabled"></div>').appendTo(credentialsLeftBox);
$('<label class="red-ui-projects-edit-form-inline-label"><input type="radio" name="projects-encryption-type" value="enabled"> <i class="fa fa-lock"></i> <span>'+RED._("projects.encryption-config.enable")+'</span></label>').appendTo(credentialsEnabledBox);
var credentialsDisabledBox = $('<div class="form-row red-ui-projects-dialog-credentials-box-disabled disabled"></div>').appendTo(credentialsLeftBox);
$('<label class="red-ui-projects-edit-form-inline-label"><input type="radio" name="projects-encryption-type" value="disabled"> <i class="fa fa-unlock"></i> <span>'+RED._("projects.encryption-config.disable")+'</span></label>').appendTo(credentialsDisabledBox);
credentialsLeftBox.find("input[name=projects-encryption-type]").on("click", function(e) {
var val = $(this).val();
@ -1294,15 +1287,8 @@ RED.projects = (function() {
$(".projects-encryption-disabled-row").show();
}
toEnable.css({
borderColor: "#ccc",
borderRightColor: "white"
});
toDisable.css({
borderColor: "white",
borderRightColor: "#ccc"
})
toEnable.removeClass("disabled");
toDisable.addClass("disabled");
validateForm();
})
@ -1689,7 +1675,7 @@ RED.projects = (function() {
dialogBody.append(container);
dialog.dialog('option','title',screen.title||"");
dialog.dialog("open");
dialog.dialog({position: { 'my': 'center top', 'at': 'center top+10%', 'of': window }});
dialog.dialog({position: { 'my': 'center top', 'at': 'center top+20', 'of': window }});
}
function createProjectList(options) {
@ -2217,25 +2203,17 @@ RED.projects = (function() {
}
function init() {
dialog = $('<div id="red-ui-projects-dialog" class="hide node-red-dialog red-ui-projects-edit-form"><form class="form-horizontal"></form><div class="red-ui-component-spinner hide"><img src="red/images/spin.svg"/></div></div>')
dialog = $('<div id="red-ui-projects-dialog" class="hide red-ui-projects-edit-form"><form class="form-horizontal"></form><div class="red-ui-component-spinner hide"><img src="red/images/spin.svg"/></div></div>')
.appendTo("#red-ui-editor")
.dialog({
modal: true,
autoOpen: false,
width: 600,
resizable: false,
open: function(e) {
$(this).parent().find(".ui-dialog-titlebar-close").hide();
// $("#red-ui-header-shade").show();
// $("#red-ui-editor-shade").show();
// $("#red-ui-palette-shade").show();
// $("#red-ui-sidebar-shade").show();
},
close: function(e) {
// $("#red-ui-header-shade").hide();
// $("#red-ui-editor-shade").hide();
// $("#red-ui-palette-shade").hide();
// $("#red-ui-sidebar-shade").hide();
classes: {
"ui-dialog": "red-ui-editor-dialog",
"ui-dialog-titlebar-close": "hide",
"ui-widget-overlay": "red-ui-editor-dialog"
}
});
dialogBody = dialog.find("form");

View File

@ -178,6 +178,7 @@ RED.sidebar = (function() {
})
$("#red-ui-sidebar-separator").on("mouseleave", function() {
if (!sidebarSeparator.dragging) {
sidebarControls.stop(false,true);
sidebarControls.hide();
}
});

View File

@ -30,7 +30,11 @@ RED.user = (function() {
dialog.dialog({
autoOpen: false,
dialogClass: "ui-dialog-no-close",
classes: {
"ui-dialog": "red-ui-editor-dialog",
"ui-dialog-titlebar-close": "hide",
"ui-widget-overlay": "red-ui-editor-dialog"
},
modal: true,
closeOnEscape: !!opts.cancelable,
width: 600,

View File

@ -14,9 +14,11 @@
* limitations under the License.
**/
body {
font-size: 14px;
font-family: 'Helvetica Neue', Arial, Helvetica, sans-serif;
.red-ui-editor {
font-size: $primary-font-size;
font-family: $primary-font;
padding: 0;
margin: 0;
background: $primary-background;
@ -137,7 +139,7 @@ i.spinner {
code, pre {
padding: 0 3px 2px;
font-family: monospace;
font-family: $monospace-font;
font-size: 14px;
color: #333333;
border-radius: 1px;

View File

@ -14,14 +14,23 @@
* limitations under the License.
**/
$primary-font: 'Helvetica Neue', Arial, Helvetica, sans-serif;
$primary-font-size: 14px;
$monospace-font: Menlo, Consolas, 'DejaVu Sans Mono', Courier, monospace;
$primary-background: #f3f3f3;
$primary-text-color: #555;
$secondary-text-color: #999;
$form-background: #fff;
$form-placeholder-color: #bbbbbb;
$form-text-color: $primary-text-color;
$form-input-focus-color: rgba(85,150,230,0.8);
$form-input-border-color: #ccc;
$form-input-border-selected-color: #aaa;
$form-input-border-error-color: rgb(214, 97, 95);
$form-input-background: #fff;
$form-input-background-disabled: #eee;
@ -101,6 +110,11 @@ $menuHoverColor: #ffffff;
$menuHoverBackground: #999;
$menuCaret: #e0e0e0;
$keyboard-help-key-border: #ddd;
$keyboard-help-key-background: #f6f6f6;
$keyboard-help-key-shadow: #999;
$view-navigator-background: rgba(245,245,245,0.8);
@ -114,3 +128,5 @@ $link-link-color: #ccc;
$link-link-active-color: #ff7f0e;
$link-subflow-color: #bbb;
$link-unknown-color: #f00;
$clipboard-textarea-background: #F3E7E7;

View File

@ -165,7 +165,7 @@
}
.red-ui-debug-msg-element {
color: #333;
font-family: Menlo, monospace;
font-family: $monospace-font;
font-size: 13px !important;
line-height: 1.3em;
}
@ -211,7 +211,7 @@
display:none;
}
.red-ui-debug-msg-object-entry pre {
font-family: Menlo, monospace;
font-family: $monospace-font;
font-size: 13px;
line-height: 1.2em;
margin: 0 0 0 -1em;

View File

@ -447,7 +447,7 @@
text-align: center;
border-left: 1px solid #eee;
margin:0;
input {
input.red-ui-diff-selectbox-input {
margin-top: 8px;
}
@ -538,7 +538,7 @@ ul.red-ui-deploy-dialog-confirm-list {
word-wrap: break-word;
}
td.lineno {
font-family: monospace;
font-family: $monospace-font;
text-align: right;
color: #999;
background: #f6f6f6;
@ -554,7 +554,7 @@ ul.red-ui-deploy-dialog-confirm-list {
border-left: 1px solid $secondary-border-color;
}
td.linetext {
font-family: monospace;
font-family: $monospace-font;
white-space: pre-wrap;
padding: 1px 5px;
border-left: 1px solid #ccc;
@ -612,7 +612,7 @@ ul.red-ui-deploy-dialog-confirm-list {
}
tr.red-ui-diff-text-file-header td {
.filename {
font-family: monospace;
font-family: $monospace-font;
}
background: #f3f3f3;
padding: 5px 10px 5px 0;
@ -648,7 +648,7 @@ ul.red-ui-deploy-dialog-confirm-list {
}
tr.red-ui-diff-text-header > td:not(.flow-diff) {
font-family: monospace;
font-family: $monospace-font;
padding: 5px 10px;
text-align: left;
color: #666;

View File

@ -15,6 +15,8 @@
**/
.red-ui-menu-dropdown {
font-family: $primary-font;
font-size: $primary-font-size;
position: absolute;
top: 100%;
width: 200px;

View File

@ -49,10 +49,10 @@
position: relative;
box-sizing: border-box;
padding: 0.1px; // prevent margin collapsing
.dialog-form,#dialog-form, #node-config-dialog-edit-form {
margin: 20px;
height: calc(100% - 40px);
}
// .dialog-form,#dialog-form, #node-config-dialog-edit-form {
// margin: 20px;
// height: calc(100% - 40px);
// }
}
.red-ui-tray-content {
overflow: auto;
@ -153,7 +153,8 @@
cursor: default;
}
}
.red-ui-tray-resize-button {
a.red-ui-tray-resize-button,
button.red-ui-tray-resize-button {
@include workspace-button;
display: block;
height: 37px;
@ -165,44 +166,55 @@
color: $workspace-button-color;
}
.dialog-form, #dialog-form, #node-config-dialog-edit-form {
height: 100%;
.red-ui-editor {
.dialog-form, #dialog-form, #node-config-dialog-edit-form {
margin: 20px;
height: calc(100% - 40px);
}
}
.red-ui-editor-dialog {
.dialog-form, #dialog-form, #node-config-dialog-edit-form {
margin: 0;
height:100%;
}
}
.input-error {
border-color: rgb(214, 97, 95) !important;
}
.red-ui-editor,.red-ui-editor-dialog {
.form-row {
clear: both;
color: $form-text-color;
margin-bottom:12px;
}
.form-row label {
display: inline-block;
width: 100px;
}
.form-row input, .form-row div[contenteditable="true"] {
width:70%;
}
.input-error {
border-color: $form-input-border-error-color !important;
}
.form-tips {
background: #ffe;
padding: 8px;
border-radius: 2px;
border: 1px solid $secondary-border-color;
max-width: 450px;
}
.form-tips code {
border: none;
padding: auto;
}
.form-tips a {
text-decoration: underline;
}
.form-row {
clear: both;
color: $form-text-color;
margin-bottom:12px;
}
.form-row label {
display: inline-block;
width: 100px;
}
.form-row input, .form-row div[contenteditable="true"] {
width:70%;
}
.form-tips {
background: #ffe;
padding: 8px;
border-radius: 2px;
border: 1px solid $secondary-border-color;
max-width: 450px;
}
.form-tips code {
border: none;
padding: auto;
}
.form-tips a {
text-decoration: underline;
}
.form-warning {
border-color: #d6615f;
.form-warning {
border-color: #d6615f;
}
}
.node-text-editor {
@ -221,8 +233,8 @@
border:1px solid #ccc;
border-radius:5px;
overflow: hidden;
font-size: 14px !important;
font-family: Menlo, Consolas, 'DejaVu Sans Mono', Courier, monospace !important;
font-size: $primary-font-size !important;
font-family: $monospace-font !important;
height: 100%;
&.red-ui-editor-text-container-toolbar {
@ -230,7 +242,8 @@
}
}
.editor-button {
a.editor-button,
button.editor-button {
@include workspace-button;
height: 34px;
line-height: 32px;
@ -245,7 +258,8 @@
}
.editor-button-small {
a.editor-button-small,
button.editor-button-small {
height: 20px;
min-width: 20px;
line-height: 18px;

View File

@ -271,6 +271,7 @@ g.link_unknown path.link_line {
.port_tooltip_label {
stroke-width: 0;
fill: $popover-color;
font-family: $primary-font;
font-size: 12px;
pointer-events: none;
-webkit-touch-callout: none;

File diff suppressed because it is too large Load Diff

View File

@ -16,11 +16,11 @@
.ui-widget {
font-size: 14px !important;
font-family: 'Helvetica Neue', Arial, Helvetica, sans-serif !important;
font-family: $primary-font;
}
.ui-widget input, .ui-widget div[contenteditable="true"], .ui-widget select, .ui-widget textarea, .ui-widget button {
font-size: 14px !important;
font-family: 'Helvetica Neue', Arial, Helvetica, sans-serif !important;
font-family: $primary-font;
}
.ui-widget input, .ui-widget div[contenteditable="true"] {
box-shadow: none;

View File

@ -114,12 +114,12 @@
}
}
.help-key {
border: 1px solid #ddd;
border: 1px solid $keyboard-help-key-border;
padding: 4px;
border-radius: 3px;
background: #f6f6f6;
font-family: Courier, monospace;
box-shadow: #999 1px 1px 1px;
background: $keyboard-help-key-background;
font-family: $monospace-font;
box-shadow: $keyboard-help-key-shadow 1px 1px 1px;
}
.help-key-block {
white-space: nowrap;

View File

@ -18,14 +18,13 @@
pre {
margin: 10px 0;
border: none;
color: #666;
color: $primary-text-color;
span {
padding: 5px 0;
}
span.error {
padding: 5px;
background: #e25151;
color: white;
border: 1px solid $form-input-border-error-color;
margin: 0 1px;
}
}
@ -36,16 +35,23 @@
resize: none;
width: 100%;
border-radius: 4px;
font-family: monospace !important;
font-family: $monospace-font !important;
font-size: 13px !important;
height: 300px;
line-height: 1.3em;
padding: 6px 10px;
background: #F3E7E7;
color: #533;
background: $clipboard-textarea-background;
}
}
.red-ui-clipboard-dialog-tabs {
position: absolute;
top:0;
left:0;
bottom:0;
width:120px;
}
.red-ui-clipboard-dialog-tabs-content {
position: absolute;
top: 0;
@ -53,7 +59,7 @@
right: 0;
bottom: 0;
padding: 0;
background: white;
background: $form-input-background;
&>div {
height: calc(100% - 20px)
}

View File

@ -280,42 +280,3 @@
.component-shade {
@include shade
}
.red-ui-component-footer {
@include component-footer;
}
.red-ui-footer-button {
@include component-footer-button;
}
.red-ui-footer-button-toggle {
@include component-footer-button-toggle;
}
.red-ui-statusbar-widget {
margin: 0 2px;
display: inline-block;
vertical-align: middle;
height: 100%;
line-height: 20px;
}
.red-ui-statusbar-bucket {
position: absolute;
top: 0;
bottom: 0;
}
.red-ui-statusbar-bucket-left {
left: 10px;
.red-ui-statusbar-widget:first-child {
margin-left: 0;
}
}
.red-ui-statusbar-bucket-right {
right: 10px;
.red-ui-statusbar-widget:last-child {
margin-right: 0;
}
}

View File

@ -156,8 +156,8 @@
border-radius: 3px;
vertical-align: middle;
margin-right: 5px;
background: #fff;
border: 1px solid #fff;
background: #eee;
border: 1px dashed #fff;
}
.red-ui-palette-module-set-button-group {
position: absolute;

View File

@ -25,6 +25,7 @@
color: $popover-color;
border-radius: 4px;
z-index: 1000;
font-family: $primary-font;
font-size: 14px;
line-height: 1.4em;
@include component-shadow;
@ -140,7 +141,7 @@
.red-ui-popover-key {
font-size: 11px;
font-family: monospace;
font-family: $monospace-font;
margin-left: 3px;
border: 1px solid #999;
border-radius:3px;

View File

@ -46,7 +46,7 @@
}
input[type=checkbox], input[type=radio] {
width: auto;
vertical-align: top;
vertical-align: middle;
}
}
@ -125,6 +125,62 @@
.red-ui-projects-dialog-screen-secret {
min-height: auto;
}
.red-ui-projects-dialog-credentials-box {
width: 550px;
> div {
vertical-align: top;
display: inline-block;
}
}
.red-ui-projects-dialog-credentials-box-right {
min-height:150px;
box-sizing: border-box;
float: right;
width: 331px;
margin-left: -1px;
padding: 15px;
margin-top: -15px;
border: 1px solid $secondary-border-color;
border-radius: 3px;
}
.red-ui-projects-dialog-credentials-box-left {
width: 220px;
> div {
padding: 7px 8px 3px 8px;
border: 1px solid $secondary-border-color;
border-radius: 4px;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-right-color: $form-background;
&.disabled {
border-color: $form-background;
border-right-color:$secondary-border-color;
}
i {
font-size: 1.4em;
margin-right: 8px;
vertical-align: middle;
}
label.red-ui-projects-edit-form-inline-label {
margin-left: 5px;
span {
vertical-align: middle;
}
}
input[type="radio"] {
vertical-align: middle;
margin-top:0;
margin-right: 10px;
}
}
}
.red-ui-projects-dialog-credentials-box-enabled {
}
.red-ui-projects-dialog-credentials-box-disabled {
}
.red-ui-projects-dialog-project-list-container {
border: 1px solid $secondary-border-color;
border-radius: 2px;
@ -149,6 +205,8 @@
&.projects-list-entry-current {
&:not(.selectable) {
background: #f9f9f9;
border-left: 3px solid #f9f9f9;
border-right: 3px solid #f9f9f9;
}
i {
color: #999;
@ -158,8 +216,8 @@
cursor: pointer;
&:hover {
background: #f3f3f3;
// border-left-color: #aaa;
// border-right-color: #aaa;
border-left-color: #f3f3f3;
border-right-color: #f3f3f3;
}
}
.red-ui-projects-dialog-project-list-entry-icon {
@ -493,7 +551,7 @@
}
.red-ui-sidebar-vc-commit-sha {
float: right;
font-family: monospace;
font-family: $monospace-font;
color: #c38888;
display: inline-block;
font-size: 0.85em;
@ -828,3 +886,10 @@ div.red-ui-projects-dialog-ssh-public-key {
margin-bottom: 10px;
}
}
#red-ui-settings-tab-gitconfig {
padding: 8px 20px 20px;
}
.red-ui-settings-section-description {
color: $secondary-text-color;
}

View File

@ -84,16 +84,20 @@
@include component-footer-button-toggle;
}
.sidebar-header-button, /* Deprecated -> red-ui-sidebar-header-button */
.red-ui-sidebar-header-button {
a.sidebar-header-button,
button.sidebar-header-button, /* Deprecated -> red-ui-sidebar-header-button */
a.red-ui-sidebar-header-button,
button.red-ui-sidebar-header-button {
@include workspace-button;
font-size: 13px;
line-height: 13px;
padding: 5px 8px;
}
.sidebar-header-button-toggle, /* Deprecated -> red-ui-sidebar-header-button-toggle */
.red-ui-sidebar-header-button-toggle {
a.sidebar-header-button-toggle, /* Deprecated -> red-ui-sidebar-header-button-toggle */
button.sidebar-header-button-toggle, /* Deprecated -> red-ui-sidebar-header-button-toggle */
a.red-ui-sidebar-header-button-toggle,
button.red-ui-sidebar-header-button-toggle {
@include workspace-button-toggle;
font-size: 13px;
line-height: 13px;

View File

@ -144,7 +144,7 @@ div.node-info {
margin: 5px auto 10px;
&>dt {
padding: 0px 3px 2px 3px;
font-family: monospace;
font-family: $monospace-font;
font-weight: normal;
margin: 5px 3px 1px;
color: #AD1625;
@ -154,7 +154,7 @@ div.node-info {
}
.property-type {
font-family: 'Helvetica Neue', Arial, Helvetica, sans-serif;
font-family: $primary-font;
color: #666;
font-style: italic;
font-size: 11px;

View File

@ -39,7 +39,7 @@
}
.meta {
float: right;
input[type="checkbox"] {
input[type="checkbox"].red-ui-treeList-checkbox {
margin: 0;
}
}

View File

@ -32,7 +32,7 @@
right: 5px;
top: 9px;
}
input {
input.red-ui-searchBox-input {
border-radius: 0;
border: none;
width: 100%;

View File

@ -94,7 +94,7 @@
color: $list-item-color;
}
input {
input.red-ui-treeList-checkbox {
margin: 0;
}
}

View File

@ -25,7 +25,7 @@
box-sizing: border-box;
overflow:visible;
position: relative;
.red-ui-typedInput-input {
.red-ui-typedInput-input-wrap {
position: absolute;
left:0;
right:0;
@ -33,7 +33,7 @@
bottom:0;
outline: red;
}
input {
input.red-ui-typedInput-input {
width: 100%;
padding: 0 0 0 3px;
margin:0;
@ -50,7 +50,10 @@
border-color: $form-input-focus-color !important;
}
button {
button.red-ui-typedInput-type-select,
button.red-ui-typedInput-option-expand,
button.red-ui-typedInput-option-trigger
{
text-align: left;
border: none;
position: absolute;
@ -152,6 +155,9 @@
}
.red-ui-typedInput-options {
@include component-shadow;
font-family: $primary-font;
font-size: $primary-font-size;
position: absolute;
border: 1px solid $primary-border-color;
background: #fff;

View File

@ -109,3 +109,43 @@
strokeWidth: 1;
fill: white;
}
.red-ui-component-footer {
@include component-footer;
}
a.red-ui-footer-button,
button.red-ui-footer-button {
@include component-footer-button;
}
a.red-ui-footer-button-toggle,
button.red-ui-footer-button-toggle {
@include component-footer-button-toggle;
}
.red-ui-statusbar-widget {
margin: 0 2px;
display: inline-block;
vertical-align: middle;
height: 100%;
line-height: 20px;
}
.red-ui-statusbar-bucket {
position: absolute;
top: 0;
bottom: 0;
}
.red-ui-statusbar-bucket-left {
left: 10px;
.red-ui-statusbar-widget:first-child {
margin-left: 0;
}
}
.red-ui-statusbar-bucket-right {
right: 10px;
.red-ui-statusbar-widget:last-child {
margin-right: 0;
}
}

View File

@ -179,7 +179,7 @@
</div>
<div id="mqtt-broker-tab-messages" style="display:none">
<div id="mqtt-broker-section-birth">
<div class="palette-header">
<div class="red-ui-palette-header">
<i class="fa fa-angle-down"></i><span data-i18n="mqtt.sections-label.birth-message"></span>
</div>
<div class="section-content" style="padding:10px 0 0 10px">
@ -205,7 +205,7 @@
</div>
</div>
<div id="mqtt-broker-section-close">
<div class="palette-header">
<div class="red-ui-palette-header">
<i class="fa fa-angle-down"></i><span data-i18n="mqtt.sections-label.close-message"></span>
</div>
<div class="section-content" style="padding:10px 0 0 10px">
@ -231,7 +231,7 @@
</div>
</div>
<div id="mqtt-broker-section-will">
<div class="palette-header">
<div class="red-ui-palette-header">
<i class="fa fa-angle-down"></i><span data-i18n="mqtt.sections-label.will-message"></span>
</div>
<div class="section-content" style="padding:10px 0 0 10px">
@ -336,7 +336,7 @@
function setUpSection(sectionId, isExpanded) {
var birthMessageSection = $(sectionId);
var paletteHeader = birthMessageSection.find('.palette-header');
var paletteHeader = birthMessageSection.find('.red-ui-palette-header');
var twistie = paletteHeader.find('i');
var sectionContent = birthMessageSection.find('.section-content');