From 27aa5ae7dbeed0d1244ca179ba0a1d19ecd83f02 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Mon, 13 Jul 2015 23:21:03 +0100 Subject: [PATCH] More UI refresh --- editor/images/grip.png | Bin 193 -> 192 bytes editor/js/ui/editor.js | 4 +- editor/js/ui/library.js | 6 +- editor/js/ui/notifications.js | 7 +- editor/js/ui/sidebar.js | 8 +-- editor/js/ui/tab-info.js | 1 + editor/js/ui/view.js | 2 +- editor/js/ui/workspaces.js | 4 ++ editor/sass/colors.scss | 15 ++++- editor/sass/editor.scss | 34 +++++----- editor/sass/flow.scss | 10 +-- editor/sass/library.scss | 14 ---- editor/sass/mixins.scss | 3 + editor/sass/notifications.scss | 90 ++++++++++++++++++++++--- editor/sass/palette.scss | 2 +- editor/sass/sidebar.scss | 14 +++- editor/sass/tab-info.scss | 10 ++- editor/sass/tabs.scss | 6 +- editor/sass/workspace.scss | 2 +- nodes/core/core/58-debug.html | 2 +- nodes/core/core/90-comment.html | 4 +- nodes/core/io/21-httpin.html | 2 +- nodes/core/locales/en-US/messages.json | 4 +- nodes/core/logic/10-switch.html | 8 +-- nodes/core/logic/15-change.html | 44 ++++++------ 25 files changed, 189 insertions(+), 107 deletions(-) diff --git a/editor/images/grip.png b/editor/images/grip.png index 8bdf97c7c2886bb6fa6d7e853bc892b8e27596f8..76c2e0d17b065fbec0fff51de3ccf539d4ef4241 100644 GIT binary patch delta 110 zcmX@ecz{u{Gr-TCmrII^fq{Y7)59eQNV5X55eFNPoFX9jVWOfjyC5^ucEjKH6Qgx3 zRXklBLo7}wrz9jKSQI}yQ_rShU}%__l5~K{jny3l`xF=?F0!P|@{!&KG=jm?)z4*} HQ$iB}k%Js) delta 111 zcmX@Wc#u)CGr-TCmrII^fq{Y7)59eQNQ2l49Be>RoAu?}iHgSToSK?xmu==xjMlMI z^>lFzu{fQaus||mYu45Op{v9G9zU9{bZtRk>tZf<(LOC14xkb0JlgKlOk#j$FnGH9 KxvX'); 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( + '
'+ + ' '+ '
- +
.
diff --git a/nodes/core/locales/en-US/messages.json b/nodes/core/locales/en-US/messages.json index d50a2b029..9777080c8 100644 --- a/nodes/core/locales/en-US/messages.json +++ b/nodes/core/locales/en-US/messages.json @@ -172,9 +172,7 @@ "title": "Title", "body": "Body" }, - "tip": "Tip: The text can be styled as Github flavoured Markdown", - "defaulttitle": "Comment node", - "defaultinfo": "Use this node to add simple documentation.\n\nAnything you add will be rendered in this info panel.\n\nYou may use Markdown syntax to **enhance** the *presentation*." + "tip": "Tip: The text can be styled as Github flavoured Markdown" }, "unknown": { "label": { diff --git a/nodes/core/logic/10-switch.html b/nodes/core/logic/10-switch.html index c8f5f8c03..2aad67b03 100644 --- a/nodes/core/logic/10-switch.html +++ b/nodes/core/logic/10-switch.html @@ -28,7 +28,7 @@
- +
',{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", style:"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..e480493cf 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", style:"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); $('