From 9dac679b72fbacd55eda20d454d3e0385d42b11d Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Tue, 30 Apr 2019 22:56:39 +0100 Subject: [PATCH] Namespace all sidebar css --- .../editor-client/src/js/keymap.json | 2 +- .../editor-client/src/js/text/bidi.js | 2 +- .../editor-client/src/js/ui/deploy.js | 8 +- .../@node-red/editor-client/src/js/ui/diff.js | 4 +- .../editor-client/src/js/ui/palette-editor.js | 8 +- .../src/js/ui/projects/projectSettings.js | 4 +- .../src/js/ui/projects/projects.js | 4 +- .../editor-client/src/js/ui/search.js | 10 +- .../editor-client/src/js/ui/sidebar.js | 99 ++++++++++--------- .../editor-client/src/js/ui/tab-config.js | 18 ++-- .../editor-client/src/js/ui/tab-context.js | 6 +- .../@node-red/editor-client/src/js/ui/tray.js | 4 +- .../editor-client/src/js/ui/userSettings.js | 4 +- .../editor-client/src/js/ui/workspaces.js | 4 +- .../editor-client/src/sass/editor.scss | 4 +- .../editor-client/src/sass/sidebar.scss | 47 +++++---- .../editor-client/src/sass/tab-config.scss | 2 +- .../editor-client/templates/index.mst | 9 +- .../nodes/core/core/lib/debug/debug-utils.js | 18 ++-- 19 files changed, 130 insertions(+), 127 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/keymap.json b/packages/node_modules/@node-red/editor-client/src/js/keymap.json index ea32e66f3..4de4726cd 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/keymap.json +++ b/packages/node_modules/@node-red/editor-client/src/js/keymap.json @@ -23,7 +23,7 @@ "ctrl-g v": "core:show-version-control-tab", "ctrl-shift-l": "core:show-event-log" }, - "sidebar-node-config": { + "red-ui-sidebar-node-config": { "backspace": "core:delete-config-selection", "delete": "core:delete-config-selection", "ctrl-a": "core:select-all-config-nodes", diff --git a/packages/node_modules/@node-red/editor-client/src/js/text/bidi.js b/packages/node_modules/@node-red/editor-client/src/js/text/bidi.js index 1835f5111..6bc6d60ef 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/text/bidi.js +++ b/packages/node_modules/@node-red/editor-client/src/js/text/bidi.js @@ -104,7 +104,7 @@ RED.text.bidi = (function() { $("#workspace").find('span.bidiAware').each(function() { $(this).attr("dir", resolveBaseTextDir($(this).html())); }); - $("#sidebar").find('span.bidiAware').each(function() { + $("#red-ui-sidebar").find('span.bidiAware').each(function() { $(this).attr("dir", resolveBaseTextDir($(this).text())); }); } diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js index 9a5a56d99..711d51444 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js @@ -274,7 +274,7 @@ RED.deploy = (function() { $("#header-shade").show(); $("#editor-shade").show(); $("#red-ui-palette-shade").show(); - $("#sidebar-shade").show(); + $("#red-ui-sidebar-shade").show(); $.ajax({ url:"flows", @@ -309,7 +309,7 @@ RED.deploy = (function() { $("#header-shade").hide(); $("#editor-shade").hide(); $("#red-ui-palette-shade").hide(); - $("#sidebar-shade").hide(); + $("#red-ui-sidebar-shade").hide(); },delta); }); } @@ -425,7 +425,7 @@ RED.deploy = (function() { $("#header-shade").show(); $("#editor-shade").show(); $("#red-ui-palette-shade").show(); - $("#sidebar-shade").show(); + $("#red-ui-sidebar-shade").show(); $.ajax({ url:"flows", type: "POST", @@ -495,7 +495,7 @@ RED.deploy = (function() { $("#header-shade").hide(); $("#editor-shade").hide(); $("#red-ui-palette-shade").hide(); - $("#sidebar-shade").hide(); + $("#red-ui-sidebar-shade").hide(); },delta); }); } diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js index fd7a9bc7d..32883d970 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js @@ -1283,11 +1283,11 @@ RED.diff = (function() { diffTable.finish(); diffTable.list.show(); },300); - $("#sidebar-shade").show(); + $("#red-ui-sidebar-shade").show(); }, close: function() { diffVisible = false; - $("#sidebar-shade").hide(); + $("#red-ui-sidebar-shade").hide(); }, show: function() { diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js index 7962e83bc..13a1b9044 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js @@ -761,9 +761,9 @@ RED.palette.editor = (function() { $('').text(RED._("palette.editor.sort")+' ').appendTo(toolBar); var sortGroup = $('').appendTo(toolBar); - var sortRelevance = $('').appendTo(sortGroup); - var sortAZ = $('').appendTo(sortGroup); - var sortRecent = $('').appendTo(sortGroup); + var sortRelevance = $('').appendTo(sortGroup); + var sortAZ = $('').appendTo(sortGroup); + var sortRecent = $('').appendTo(sortGroup); var sortOpts = [ @@ -785,7 +785,7 @@ RED.palette.editor = (function() { }); var refreshSpan = $('').appendTo(toolBar); - var refreshButton = $('').appendTo(refreshSpan); + var refreshButton = $('').appendTo(refreshSpan); refreshButton.on("click", function(e) { e.preventDefault(); loadedList = []; diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js index d6c2d63a5..4d762ac1b 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js @@ -96,7 +96,7 @@ RED.projects.settings = (function() { }); settingsContent.i18n(); settingsTabs.activateTab("project-settings-tab-"+(initialTab||'main')) - $("#sidebar-shade").show(); + $("#red-ui-sidebar-shade").show(); }, close: function() { settingsVisible = false; @@ -105,7 +105,7 @@ RED.projects.settings = (function() { pane.close(); } }); - $("#sidebar-shade").hide(); + $("#red-ui-sidebar-shade").hide(); }, show: function() {} diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js index 8749a2a88..227bd8f3b 100755 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js @@ -2229,13 +2229,13 @@ RED.projects = (function() { // $("#header-shade").show(); // $("#editor-shade").show(); // $("#red-ui-palette-shade").show(); - // $("#sidebar-shade").show(); + // $("#red-ui-sidebar-shade").show(); }, close: function(e) { // $("#header-shade").hide(); // $("#editor-shade").hide(); // $("#red-ui-palette-shade").hide(); - // $("#sidebar-shade").hide(); + // $("#red-ui-sidebar-shade").hide(); } }); dialogBody = dialog.find("form"); diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js index bdd9f138d..6bda95234 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js @@ -257,8 +257,8 @@ RED.search = (function() { $("#header-shade").show(); $("#editor-shade").show(); $("#red-ui-palette-shade").show(); - $("#sidebar-shade").show(); - $("#sidebar-separator").hide(); + $("#red-ui-sidebar-shade").show(); + $("#red-ui-sidebar-separator").hide(); indexWorkspace(); if (dialog === null) { createDialog(); @@ -278,8 +278,8 @@ RED.search = (function() { $("#header-shade").hide(); $("#editor-shade").hide(); $("#red-ui-palette-shade").hide(); - $("#sidebar-shade").hide(); - $("#sidebar-separator").show(); + $("#red-ui-sidebar-shade").hide(); + $("#red-ui-sidebar-separator").show(); if (dialog !== null) { dialog.slideUp(200,function() { searchInput.searchBox('value',''); @@ -302,7 +302,7 @@ RED.search = (function() { $("#header-shade").on('mousedown',hide); $("#editor-shade").on('mousedown',hide); $("#red-ui-palette-shade").on('mousedown',hide); - $("#sidebar-shade").on('mousedown',hide); + $("#red-ui-sidebar-shade").on('mousedown',hide); } return { diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js b/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js index dd7940f02..7bb7f1d92 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js @@ -16,33 +16,8 @@ RED.sidebar = (function() { //$('#sidebar').tabs(); - var sidebar_tabs = RED.tabs.create({ - id:"sidebar-tabs", - onchange:function(tab) { - $("#sidebar-content").children().hide(); - $("#sidebar-footer").children().hide(); - if (tab.onchange) { - tab.onchange.call(tab); - } - $(tab.wrapper).show(); - if (tab.toolbar) { - $(tab.toolbar).show(); - } - }, - onremove: function(tab) { - $(tab.wrapper).hide(); - if (tab.onremove) { - tab.onremove.call(tab); - } - }, - // minimumActiveTabWidth: 70, - collapsible: true - // scrollable: true - }); - - var knownTabs = { - - }; + var sidebar_tabs; + var knownTabs = {}; function addTab(title,content,closeable,visible) { var options; @@ -62,16 +37,16 @@ RED.sidebar = (function() { delete options.closeable; - options.wrapper = $('
',{style:"height:100%"}).appendTo("#sidebar-content") + options.wrapper = $('
',{style:"height:100%"}).appendTo("#red-ui-sidebar-content") options.wrapper.append(options.content); options.wrapper.hide(); if (!options.enableOnEdit) { - options.shade = $('
',{class:"sidebar-shade hide"}).appendTo(options.wrapper); + options.shade = $('
',{class:"red-ui-sidebar-shade hide"}).appendTo(options.wrapper); } if (options.toolbar) { - $("#sidebar-footer").append(options.toolbar); + $("#red-ui-sidebar-footer").append(options.toolbar); $(options.toolbar).hide(); } var id = options.id; @@ -107,7 +82,7 @@ RED.sidebar = (function() { var sidebarSeparator = {}; sidebarSeparator.dragging = false; - $("#sidebar-separator").draggable({ + $("#red-ui-sidebar-separator").draggable({ axis: "x", start:function(event,ui) { sidebarSeparator.closing = false; @@ -121,14 +96,14 @@ RED.sidebar = (function() { if (!RED.menu.isSelected("menu-item-sidebar")) { sidebarSeparator.opening = true; var newChartRight = 7; - $("#sidebar").addClass("closing"); + $("#red-ui-sidebar").addClass("closing"); $("#workspace").css("right",newChartRight); $("#editor-stack").css("right",newChartRight+1); - $("#sidebar").width(0); + $("#red-ui-sidebar").width(0); RED.menu.setSelected("menu-item-sidebar",true); RED.events.emit("sidebar:resize"); } - sidebarSeparator.width = $("#sidebar").width(); + sidebarSeparator.width = $("#red-ui-sidebar").width(); }, drag: function(event,ui) { var d = ui.position.left-sidebarSeparator.start; @@ -147,7 +122,7 @@ RED.sidebar = (function() { if (newSidebarWidth < 150) { if (!sidebarSeparator.closing) { - $("#sidebar").addClass("closing"); + $("#red-ui-sidebar").addClass("closing"); sidebarSeparator.closing = true; } if (!sidebarSeparator.opening) { @@ -157,13 +132,13 @@ RED.sidebar = (function() { } } else if (newSidebarWidth > 150 && (sidebarSeparator.closing || sidebarSeparator.opening)) { sidebarSeparator.closing = false; - $("#sidebar").removeClass("closing"); + $("#red-ui-sidebar").removeClass("closing"); } var newChartRight = sidebarSeparator.chartRight-d; $("#workspace").css("right",newChartRight); $("#editor-stack").css("right",newChartRight+1); - $("#sidebar").width(newSidebarWidth); + $("#red-ui-sidebar").width(newSidebarWidth); sidebar_tabs.resize(); RED.events.emit("sidebar:resize"); @@ -171,26 +146,26 @@ RED.sidebar = (function() { stop:function(event,ui) { sidebarSeparator.dragging = false; if (sidebarSeparator.closing) { - $("#sidebar").removeClass("closing"); + $("#red-ui-sidebar").removeClass("closing"); RED.menu.setSelected("menu-item-sidebar",false); - if ($("#sidebar").width() < 180) { - $("#sidebar").width(180); + if ($("#red-ui-sidebar").width() < 180) { + $("#red-ui-sidebar").width(180); $("#workspace").css("right",187); $("#editor-stack").css("right",188); } } - $("#sidebar-separator").css("left","auto"); - $("#sidebar-separator").css("right",($("#sidebar").width()+2)+"px"); + $("#red-ui-sidebar-separator").css("left","auto"); + $("#red-ui-sidebar-separator").css("right",($("#red-ui-sidebar").width()+2)+"px"); RED.events.emit("sidebar:resize"); } }); - var sidebarControls = $('
').appendTo($("#sidebar-separator")); + var sidebarControls = $('
').appendTo($("#red-ui-sidebar-separator")); sidebarControls.on("click", function() { sidebarControls.hide(); RED.menu.toggleSelected("menu-item-sidebar"); }) - $("#sidebar-separator").on("mouseenter", function() { + $("#red-ui-sidebar-separator").on("mouseenter", function() { if (!sidebarSeparator.dragging) { if (RED.menu.isSelected("menu-item-sidebar")) { sidebarControls.find("i").addClass("fa-chevron-right").removeClass("fa-chevron-left"); @@ -200,7 +175,7 @@ RED.sidebar = (function() { sidebarControls.toggle("slide", { direction: "right" }, 200); } }) - $("#sidebar-separator").on("mouseleave", function() { + $("#red-ui-sidebar-separator").on("mouseleave", function() { if (!sidebarSeparator.dragging) { sidebarControls.hide(); } @@ -208,9 +183,9 @@ RED.sidebar = (function() { function toggleSidebar(state) { if (!state) { - $("#main-container").addClass("sidebar-closed"); + $("#main-container").addClass("red-ui-sidebar-closed"); } else { - $("#main-container").removeClass("sidebar-closed"); + $("#main-container").removeClass("red-ui-sidebar-closed"); sidebar_tabs.resize(); } RED.events.emit("sidebar:resize"); @@ -233,6 +208,34 @@ RED.sidebar = (function() { } function init () { + sidebar_tabs = RED.tabs.create({ + element: $('
    ').appendTo("#red-ui-sidebar"), + onchange:function(tab) { + $("#red-ui-sidebar-content").children().hide(); + $("#red-ui-sidebar-footer").children().hide(); + if (tab.onchange) { + tab.onchange.call(tab); + } + $(tab.wrapper).show(); + if (tab.toolbar) { + $(tab.toolbar).show(); + } + }, + onremove: function(tab) { + $(tab.wrapper).hide(); + if (tab.onremove) { + tab.onremove.call(tab); + } + }, + // minimumActiveTabWidth: 70, + collapsible: true + // scrollable: true + }); + + $('
    ').appendTo("#red-ui-sidebar"); + $('').appendTo("#red-ui-sidebar"); + $('
    ').appendTo("#red-ui-sidebar"); + RED.actions.add("core:toggle-sidebar",function(state){ if (state === undefined) { RED.menu.toggleSelected("menu-item-sidebar"); @@ -240,7 +243,7 @@ RED.sidebar = (function() { toggleSidebar(state); } }); - RED.popover.tooltip($("#sidebar-separator").find(".sidebar-control-right"),RED._("keyboard.toggleSidebar"),"core:toggle-sidebar"); + RED.popover.tooltip($("#red-ui-sidebar-separator").find(".red-ui-sidebar-control-right"),RED._("keyboard.toggleSidebar"),"core:toggle-sidebar"); showSidebar(); RED.sidebar.info.init(); RED.sidebar.config.init(); diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js index 067d23175..ba00580f1 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js @@ -17,20 +17,20 @@ RED.sidebar.config = (function() { var content = document.createElement("div"); - content.className = "sidebar-node-config"; - content.id = "sidebar-node-config"; + content.className = "red-ui-sidebar-node-config"; + content.id = "red-ui-sidebar-node-config"; content.tabIndex = 0; - $('
    '+ - ''+ - ' '+ + $('
    '+ + ''+ + ' '+ '
    ' ).appendTo(content); var toolbar = $('
    '+ - ' '+ - ''+ + ' '+ + ''+ '
    '); var globalCategories = $("
    ").appendTo(content); @@ -45,7 +45,7 @@ RED.sidebar.config = (function() { name = name.replace(/\./i,"-"); if (!categories[name]) { var container = $('
    ').appendTo(parent); - var header = $('
    ').appendTo(container); + var header = $('
    ').appendTo(container); if (label) { $('').text(label).appendTo(header); } else { @@ -355,7 +355,7 @@ RED.sidebar.config = (function() { var node = $(".red-ui-palette-node_id_"+id); var y = node.position().top; var h = node.height(); - var scrollWindow = $(".sidebar-node-config"); + var scrollWindow = $(".red-ui-sidebar-node-config"); var scrollHeight = scrollWindow.height(); if (y+h > scrollHeight) { diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js index 4c5a34a08..648085083 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js @@ -33,12 +33,8 @@ RED.sidebar.context = (function() { content = $("
    ").css({"position":"relative","height":"100%"}); content.className = "sidebar-context" - // var toolbar = $('
    '+ - // '
    ').appendTo(content); - var footerToolbar = $('
    '+ - // ' ' + - '
    '); + var footerToolbar = $('
    '); diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js index a7c9c8d07..267929e06 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js @@ -118,7 +118,7 @@ RED.tray = (function() { $("#header-shade").show(); $("#editor-shade").show(); $("#red-ui-palette-shade").show(); - $(".sidebar-shade").show(); + $(".red-ui-sidebar-shade").show(); tray.preferredWidth = Math.max(el.width(),500); if (!options.maximized) { body.css({"minWidth":tray.preferredWidth-40}); @@ -270,7 +270,7 @@ RED.tray = (function() { $("#header-shade").hide(); $("#editor-shade").hide(); $("#red-ui-palette-shade").hide(); - $(".sidebar-shade").hide(); + $(".red-ui-sidebar-shade").hide(); RED.events.emit("editor:close"); RED.view.focus(); } diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js b/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js index d50cd86f8..41dd21482 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js @@ -82,7 +82,7 @@ RED.userSettings = (function() { }); settingsContent.i18n(); settingsTabs.activateTab("user-settings-tab-"+(initialTab||'view')) - $("#sidebar-shade").show(); + $("#red-ui-sidebar-shade").show(); }, close: function() { settingsVisible = false; @@ -91,7 +91,7 @@ RED.userSettings = (function() { pane.close(); } }); - $("#sidebar-shade").hide(); + $("#red-ui-sidebar-shade").hide(); }, show: function() {} diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js index 478a34001..c686549c8 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js @@ -297,13 +297,13 @@ RED.workspaces = (function() { $("#chart svg").css({"pointer-events":"auto",filter:"none"}) $("#workspace-toolbar").css({"pointer-events":"auto",filter:"none"}) $("#red-ui-palette-container").css({"pointer-events":"auto",filter:"none"}) - $(".sidebar-shade").hide(); + $(".red-ui-sidebar-shade").hide(); } else { RED.view.select(false) $("#chart svg").css({"pointer-events":"none",filter:"opacity(60%)"}) $("#workspace-toolbar").css({"pointer-events":"none",filter:"opacity(60%)"}) $("#red-ui-palette-container").css({"pointer-events":"none",filter:"opacity(60%)"}) - $(".sidebar-shade").show(); + $(".red-ui-sidebar-shade").show(); } }, minimumActiveTabWidth: 150, diff --git a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss index 76735c761..34fe17609 100644 --- a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss +++ b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss @@ -154,11 +154,11 @@ background: $background-color; color: $workspace-button-color; } -#red-ui-palette-shade, #editor-shade, #header-shade, #sidebar-shade { +#red-ui-palette-shade, #editor-shade, #header-shade, #red-ui-sidebar-shade { @include shade; z-index: 2; } -#sidebar-shade { +#red-ui-sidebar-shade { left: -8px; top: -1px; bottom: -1px; diff --git a/packages/node_modules/@node-red/editor-client/src/sass/sidebar.scss b/packages/node_modules/@node-red/editor-client/src/sass/sidebar.scss index 77dcbb34c..36ee99e4f 100644 --- a/packages/node_modules/@node-red/editor-client/src/sass/sidebar.scss +++ b/packages/node_modules/@node-red/editor-client/src/sass/sidebar.scss @@ -14,7 +14,7 @@ * limitations under the License. **/ -#sidebar { +#red-ui-sidebar { position: absolute; top: 0px; right: 0px; @@ -26,13 +26,13 @@ @include component-border; } -#sidebar.closing { +#red-ui-sidebar.closing { background: #eee; border-color: #900; border-style: dashed; } -#sidebar-content { +#red-ui-sidebar-content { position: absolute; top: 35px; right: 0; @@ -41,7 +41,7 @@ overflow-y: auto; } -#sidebar-separator { +#red-ui-sidebar-separator { position: absolute; top: 5px; right: 315px; @@ -52,12 +52,12 @@ cursor: col-resize; } -.sidebar-closed > #sidebar { display: none; } -.sidebar-closed > #sidebar-separator { right: 0px !important; } -.sidebar-closed > #workspace { right: 7px !important; } -.sidebar-closed > #editor-stack { right: 8px !important; } +.red-ui-sidebar-closed > #red-ui-sidebar { display: none; } +.red-ui-sidebar-closed > #red-ui-sidebar-separator { right: 0px !important; } +.red-ui-sidebar-closed > #workspace { right: 7px !important; } +.red-ui-sidebar-closed > #editor-stack { right: 8px !important; } -#sidebar .button { +#red-ui-sidebar .button { @include workspace-button; line-height: 18px; font-size: 12px; @@ -65,7 +65,8 @@ padding: 2px 8px; } -.sidebar-header { +.sidebar-header, /* Deprecated -> red-ui-sidebar-header */ +.red-ui-sidebar-header { color: #666; text-align: right; padding: 8px 10px; @@ -74,34 +75,42 @@ white-space: nowrap; } +/* Deprecated -> red-ui-footer-button */ .sidebar-footer-button { @include component-footer-button; } +/* Deprecated -> red-ui-footer-button-toggle */ .sidebar-footer-button-toggle { @include component-footer-button-toggle; } -.sidebar-header-button { + +.sidebar-header-button, /* Deprecated -> red-ui-sidebar-header-button */ +.red-ui-sidebar-header-button { @include workspace-button; font-size: 13px; line-height: 13px; padding: 5px 8px; } -.sidebar-header-button-toggle { + +.sidebar-header-button-toggle, /* Deprecated -> red-ui-sidebar-header-button-toggle */ +.red-ui-sidebar-header-button-toggle { @include workspace-button-toggle; font-size: 13px; line-height: 13px; padding: 5px 8px; } -.sidebar-header-button:not(:first-child) { + +.sidebar-header-button, /* Deprecated -> red-ui-sidebar-header-button */ +.red-ui-sidebar-header-button:not(:first-child) { border-left: none; } -.sidebar-shade { +.red-ui-sidebar-shade { @include shade; } -@mixin sidebar-control { +@mixin red-ui-sidebar-control { display: none; position: absolute; top: calc(50% - 26px); @@ -114,14 +123,14 @@ cursor: pointer; } -.sidebar-control-right { - @include sidebar-control; +.red-ui-sidebar-control-right { + @include red-ui-sidebar-control; right: calc(100%); border-top-left-radius: 5px; border-bottom-left-radius: 5px; } -.sidebar-control-left { - @include sidebar-control; +.red-ui-sidebar-control-left { + @include red-ui-sidebar-control; left: calc(100%); border-top-right-radius: 5px; border-bottom-right-radius: 5px; diff --git a/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss b/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss index 9b3a1b2f1..8920a567a 100644 --- a/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss +++ b/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss @@ -14,7 +14,7 @@ * limitations under the License. **/ -.sidebar-node-config { +.red-ui-sidebar-node-config { position: relative; background: #f3f3f3; height: 100%; diff --git a/packages/node_modules/@node-red/editor-client/templates/index.mst b/packages/node_modules/@node-red/editor-client/templates/index.mst index 23e420e29..e5f89ee27 100644 --- a/packages/node_modules/@node-red/editor-client/templates/index.mst +++ b/packages/node_modules/@node-red/editor-client/templates/index.mst @@ -52,14 +52,9 @@
    - +
    - +
    diff --git a/packages/node_modules/@node-red/nodes/core/core/lib/debug/debug-utils.js b/packages/node_modules/@node-red/nodes/core/core/lib/debug/debug-utils.js index 2a6a0ed72..c43ada68c 100644 --- a/packages/node_modules/@node-red/nodes/core/core/lib/debug/debug-utils.js +++ b/packages/node_modules/@node-red/nodes/core/core/lib/debug/debug-utils.js @@ -40,16 +40,16 @@ RED.debug = (function() { config = _config; var content = $("
    ").css({"position":"relative","height":"100%"}); - var toolbar = $('
    '+ - ' '+ - '
    ').appendTo(content); + var toolbar = $('
    '+ + ' '+ + '
    ').appendTo(content); var footerToolbar = $('
    '+ // ''+ - // 'list'+ - // 'table '+ + // 'list'+ + // 'table '+ // ''+ - ' ' + + ' ' + '
    '); messageList = $('
    ').appendTo(content); @@ -59,9 +59,9 @@ RED.debug = (function() { var filterDialog = $('
    '+ '
    '+ ''+ - ''+ - ''+ - ' '+ + ''+ + ''+ + ' '+ ''+ '
    '+ '
    ').appendTo(toolbar);//content);