diff --git a/Gruntfile.js b/Gruntfile.js index ad46baee9..3a4ebde85 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -156,6 +156,10 @@ module.exports = function(grunt) { files: [{ dest: 'public/red/style.min.css', src: 'editor/sass/style.scss' + }, + { + dest: 'public/vendor/bootstrap/css/bootstrap.min.css', + src: 'editor/vendor/bootstrap/css/bootstrap.css' }] } }, @@ -254,7 +258,7 @@ module.exports = function(grunt) { cwd: 'editor/vendor', src: [ 'ace/**', - 'bootstrap/css/**', + //'bootstrap/css/**', 'bootstrap/img/**', 'jquery/css/**', 'font-awesome/**' diff --git a/editor/images/grip.png b/editor/images/grip.png index c01edb565..76c2e0d17 100644 Binary files a/editor/images/grip.png and b/editor/images/grip.png differ diff --git a/editor/js/ui/editor.js b/editor/js/ui/editor.js index e675b321b..1125b4d5d 100644 --- a/editor/js/ui/editor.js +++ b/editor/js/ui/editor.js @@ -362,7 +362,7 @@ RED.editor = (function() { input.replaceWith(''); updateConfigNodeSelect(property,type,node[property]); var select = $("#node-input-"+property); - select.after(' '); + select.after(' '); $('#node-input-lookup-'+property).click(function(e) { showEditConfigNodeDialog(property,type,select.find(":selected").val()); e.preventDefault(); @@ -390,7 +390,7 @@ RED.editor = (function() { input.val(node[property]); input.attr("type","hidden"); - var button = $("",{id:"node-input-edit-"+property, class:"btn"}); + var button = $("",{id:"node-input-edit-"+property, class:"editor-button"}); input.after(button); if (node[property]) { diff --git a/editor/js/ui/library.js b/editor/js/ui/library.js index 302e89cc1..15b7bb7b6 100644 --- a/editor/js/ui/library.js +++ b/editor/js/ui/library.js @@ -142,9 +142,9 @@ RED.library = (function() { return ul; } - $('#node-input-name').addClass('input-append-left').css("width","65%").after( - '
'+ - ''+ + $('#node-input-name').css("width","60%").after( + '
'+ + ' '+ '
- +
',{class:"node-input-rule-btwn-value2",type:"text",style:"width: 50px;margin-left:2px;"}).appendTo(btwnField); - var finalspan = $('',{style:"float: right; margin-top: 3px;margin-right: 10px;"}).appendTo(row); + var finalspan = $('',{style:"float: right;margin-right: 10px;"}).appendTo(row); finalspan.append(' → '+i+' '); - var deleteButton = $('',{href:"#",class:"btn btn-mini", style:"margin-left: 5px;"}).appendTo(finalspan); + var deleteButton = $('',{href:"#",class:"editor-button editor-button-small", style:"margin-top: 7px; margin-left: 5px;"}).appendTo(finalspan); $('',{class:"fa fa-remove"}).appendTo(deleteButton); selectField.change(function() { @@ -171,7 +171,7 @@ height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom"))); $("#node-input-rule-container-div").css("height",height+"px"); }; - + $( "#node-input-rule-container" ).sortable({ axis: "y", update: function( event, ui ) { diff --git a/nodes/core/logic/15-change.html b/nodes/core/logic/15-change.html index cce5ec264..6164a223c 100644 --- a/nodes/core/logic/15-change.html +++ b/nodes/core/logic/15-change.html @@ -28,7 +28,7 @@
- +
@@ -101,12 +101,12 @@ var regex = this._("change.label.regex"); if (this.reg === null) { $("#node-input-reg").prop('checked', true); } $("#node-input-action").change(); - + function generateRule(rule) { var container = $('
  • ',{style:"background: #fff; margin:0; padding:8px 0px; border-bottom: 1px solid #ccc;"}); - + var row1 = $('
    ').appendTo(container); - + var row2 = $('
    ',{style:"margin-top:8px;"}).appendTo(container); var row3 = $('
    ',{style:"margin-top:8px;"}).appendTo(container); @@ -115,36 +115,36 @@ for (var i=0;i<3;i++) { selectField.append($("").val(selectOptions[i].v).text(selectOptions[i].l)); } - + $('
    ',{style:"display:inline-block; width: 50px; text-align: right;"}).text("msg.").appendTo(row1); var propertyName = $('',{style:"width: 220px",class:"node-input-rule-property-name",type:"text"}).appendTo(row1); - - var finalspan = $('',{style:"float: right; margin-top: 3px;margin-right: 10px;"}).appendTo(row1); - var deleteButton = $('',{href:"#",class:"btn btn-mini", style:"margin-left: 5px;"}).appendTo(finalspan); + + var finalspan = $('',{style:"float: right; margin-right: 10px;"}).appendTo(row1); + var deleteButton = $('',{href:"#",class:"editor-button editor-button-small", style:"margin-top: 7px; margin-left: 5px;"}).appendTo(finalspan); $('',{class:"fa fa-remove"}).appendTo(deleteButton); - + $('
    ',{style:"display: inline-block;text-align:right; width:150px;padding-right: 10px; box-sizing: border-box;"}).text(to).appendTo(row2); var propertyValue = $('',{style:"width: 220px",class:"node-input-rule-property-value",type:"text"}).appendTo(row2); - + var row3_1 = $('
    ').appendTo(row3); $('
    ',{style:"display: inline-block;text-align:right; width:150px;padding-right: 10px; box-sizing: border-box;"}).text(search).appendTo(row3_1); var fromValue = $('',{style:"width: 220px",class:"node-input-rule-property-search-value",type:"text"}).appendTo(row3_1); - + var row3_2 = $('
    ',{style:"margin-top:8px;"}).appendTo(row3); $('
    ',{style:"display: inline-block;text-align:right; width:150px;padding-right: 10px; box-sizing: border-box;"}).text(replace).appendTo(row3_2); var toValue = $('',{style:"width: 220px",class:"node-input-rule-property-replace-value",type:"text"}).appendTo(row3_2); - + var row3_3 = $('
    ',{style:"margin-top:8px;"}).appendTo(row3); var id = "node-input-rule-property-regex-"+Math.floor(Math.random()*10000); var useRegExp = $('',{id:id,class:"node-input-rule-property-re",type:"checkbox", style:"margin-left: 150px; margin-right: 10px; display: inline-block; width: auto; vertical-align: top;"}).appendTo(row3_3); $('