diff --git a/services/static-webserver/client/source/class/osparc/Application.js b/services/static-webserver/client/source/class/osparc/Application.js index c5f760188e53..0b18c01bd22a 100644 --- a/services/static-webserver/client/source/class/osparc/Application.js +++ b/services/static-webserver/client/source/class/osparc/Application.js @@ -222,9 +222,6 @@ qx.Class.define("osparc.Application", { __setDeviceSpecificIcons: function() { const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream; const isAndroid = /android/i.test(navigator.userAgent); - const isWindows = /windows/i.test(navigator.userAgent); - // const productColor = qx.theme.manager.Color.getInstance().resolve("product-color"); - // const backgroundColor = qx.theme.manager.Color.getInstance().resolve("primary-background-color"); // default icons this.__updateMetaTags(); this.__setDefaultIcons() @@ -232,8 +229,6 @@ qx.Class.define("osparc.Application", { this.__setIOSpIcons(); } else if (isAndroid) { this.__setGoogleIcons(); - } else if (isWindows) { - // this.__updateBrowserConfig(this.__getProductMetaData().productColor); } }, @@ -246,16 +241,14 @@ qx.Class.define("osparc.Application", { } const productColor = qx.theme.manager.Color.getInstance().resolve("product-color"); - const backgroundColor = qx.theme.manager.Color.getInstance().resolve("primary-background-color"); return { productName: productName, productColor: productColor, - backgroundColor: backgroundColor } }, __updateMetaTags: function() { - // check device type and only set the icons for the divice type + // check device type and only set the icons for the device type // i.e iOS, Android or windows etc const themeColorMeta = document.querySelector("meta[name='theme-color']"); const tileColorMeta = document.querySelector("meta[name='msapplication-TileColor']"); diff --git a/services/static-webserver/client/source/class/osparc/auth/LoginPageS4L.js b/services/static-webserver/client/source/class/osparc/auth/LoginPageS4L.js index 8118ecdc9f8b..1e7cf123b378 100644 --- a/services/static-webserver/client/source/class/osparc/auth/LoginPageS4L.js +++ b/services/static-webserver/client/source/class/osparc/auth/LoginPageS4L.js @@ -29,7 +29,7 @@ qx.Class.define("osparc.auth.LoginPageS4L", { const layout = new qx.ui.layout.HBox(); this._setLayout(layout); - this.setBackgroundColor("primary-background-color"); + this.setBackgroundColor("rgba(0, 20, 46, 1)"); this._removeAll(); diff --git a/services/static-webserver/client/source/class/osparc/desktop/SlideshowView.js b/services/static-webserver/client/source/class/osparc/desktop/SlideshowView.js index 593088bc4cd9..e05a37f56a1f 100644 --- a/services/static-webserver/client/source/class/osparc/desktop/SlideshowView.js +++ b/services/static-webserver/client/source/class/osparc/desktop/SlideshowView.js @@ -24,7 +24,7 @@ qx.Class.define("osparc.desktop.SlideshowView", { this._setLayout(new qx.ui.layout.VBox()); const slideshowToolbar = this.__slideshowToolbar = new osparc.desktop.SlideshowToolbar().set({ - backgroundColor: "tab_navigation_bar_background_color" + backgroundColor: "workbench-view-navbar" }); const collapseWithUserMenu = this.__collapseWithUserMenu = new osparc.desktop.CollapseWithUserMenu(); diff --git a/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js b/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js index 1daeea1c0f1a..accb850ab5dd 100644 --- a/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js +++ b/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js @@ -40,16 +40,10 @@ qx.Class.define("osparc.desktop.WorkbenchView", { TAB_BUTTON_HEIGHT: 46, decorateSplitter: function(splitter) { - const colorManager = qx.theme.manager.Color.getInstance(); - const binaryColor = osparc.utils.Utils.getRoundedBinaryColor(colorManager.resolve("background-main")); splitter.set({ width: 2, - backgroundColor: binaryColor + backgroundColor: "workbench-view-splitter" }); - colorManager.addListener("changeTheme", () => { - const newBinaryColor = osparc.utils.Utils.getRoundedBinaryColor(colorManager.resolve("background-main")); - splitter.setBackgroundColor(newBinaryColor); - }, this); }, decorateSlider: function(slider) { @@ -202,7 +196,6 @@ qx.Class.define("osparc.desktop.WorkbenchView", { control = new qx.ui.tabview.TabView().set({ contentPadding: osparc.widget.CollapsibleViewLight.CARET_WIDTH + 2, // collapse bar + padding contentPaddingRight: 2, - backgroundColor: this.self().PRIMARY_COL_BG_COLOR, barPosition: "top" }); const collapsibleViewLeft = this.getChildControl("collapsible-view-left"); @@ -322,7 +315,7 @@ qx.Class.define("osparc.desktop.WorkbenchView", { const topBar = tabViewPrimary.getChildControl("bar"); topBar.set({ height: this.self().TAB_BUTTON_HEIGHT, - backgroundColor: "tab_navigation_bar_background_color" + backgroundColor: "workbench-view-navbar" }); this.__addTopBarSpacer(topBar); @@ -392,7 +385,7 @@ qx.Class.define("osparc.desktop.WorkbenchView", { const topBar = tabViewSecondary.getChildControl("bar"); topBar.set({ height: this.self().TAB_BUTTON_HEIGHT, - backgroundColor: "tab_navigation_bar_background_color" + backgroundColor: "workbench-view-navbar" }); this.__addTopBarSpacer(topBar); @@ -427,7 +420,7 @@ qx.Class.define("osparc.desktop.WorkbenchView", { topBar.set({ height: this.self().TAB_BUTTON_HEIGHT, alignY: "top", - backgroundColor: "tab_navigation_bar_background_color" + backgroundColor: "workbench-view-navbar" }); this.__addTopBarSpacer(topBar); @@ -483,7 +476,7 @@ qx.Class.define("osparc.desktop.WorkbenchView", { __addTopBarSpacer: function(tabViewTopBar) { const spacer = new qx.ui.core.Widget().set({ - backgroundColor: "tab_navigation_bar_background_color" + backgroundColor: "workbench-view-navbar" }); tabViewTopBar.add(spacer, { flex: 1 @@ -492,7 +485,7 @@ qx.Class.define("osparc.desktop.WorkbenchView", { __createCollapsibleViewSpacer: function() { const spacer = new qx.ui.core.Widget().set({ - backgroundColor: "tab_navigation_bar_background_color", + backgroundColor: "workbench-view-navbar", height: this.self().TAB_BUTTON_HEIGHT }); return spacer; @@ -1079,13 +1072,6 @@ qx.Class.define("osparc.desktop.WorkbenchView", { const nodeOptions = new osparc.widget.NodeOptions(node); nodeOptions.buildLayout(); - [ - "versionChanged", - "bootModeChanged", - "limitsChanged" - ].forEach(eventName => { - nodeOptions.addListener(eventName, () => this.__populateSecondaryColumn(node)); - }); return nodeOptions; }, diff --git a/services/static-webserver/client/source/class/osparc/node/BootOptionsView.js b/services/static-webserver/client/source/class/osparc/node/BootOptionsView.js index a6c38981dff0..291c028422d8 100644 --- a/services/static-webserver/client/source/class/osparc/node/BootOptionsView.js +++ b/services/static-webserver/client/source/class/osparc/node/BootOptionsView.js @@ -18,10 +18,6 @@ qx.Class.define("osparc.node.BootOptionsView", { extend: osparc.node.ServiceOptionsView, - events: { - "bootModeChanged": "qx.event.type.Event" - }, - members: { _applyNode: function(node) { if (node.hasBootModes()) { @@ -61,7 +57,6 @@ qx.Class.define("osparc.node.BootOptionsView", { setTimeout(() => { buttonsLayout.setEnabled(true); node.requestStartNode(); - this.fireEvent("bootModeChanged"); }, osparc.desktop.StudyEditor.AUTO_SAVE_INTERVAL); } }, this); diff --git a/services/static-webserver/client/source/class/osparc/node/LifeCycleView.js b/services/static-webserver/client/source/class/osparc/node/LifeCycleView.js index 2cdfb2c1f749..5f810b187991 100644 --- a/services/static-webserver/client/source/class/osparc/node/LifeCycleView.js +++ b/services/static-webserver/client/source/class/osparc/node/LifeCycleView.js @@ -18,10 +18,6 @@ qx.Class.define("osparc.node.LifeCycleView", { extend: osparc.node.ServiceOptionsView, - events: { - "versionChanged": "qx.event.type.Event" - }, - members: { _applyNode: function(node) { if (node.isUpdatable() || node.isDeprecated() || node.isRetired()) { @@ -125,7 +121,6 @@ qx.Class.define("osparc.node.LifeCycleView", { setTimeout(() => { updateButton.setFetching(false); node.requestStartNode(); - this.fireEvent("versionChanged"); }, osparc.desktop.StudyEditor.AUTO_SAVE_INTERVAL); }); diff --git a/services/static-webserver/client/source/class/osparc/node/UpdateResourceLimitsView.js b/services/static-webserver/client/source/class/osparc/node/UpdateResourceLimitsView.js index f6770a7e6752..3c75815c2965 100644 --- a/services/static-webserver/client/source/class/osparc/node/UpdateResourceLimitsView.js +++ b/services/static-webserver/client/source/class/osparc/node/UpdateResourceLimitsView.js @@ -18,10 +18,6 @@ qx.Class.define("osparc.node.UpdateResourceLimitsView", { extend: osparc.node.ServiceOptionsView, - events: { - "limitsChanged": "qx.event.type.Event" - }, - members: { __resourceFields: null, __saveBtn: null, @@ -159,7 +155,6 @@ qx.Class.define("osparc.node.UpdateResourceLimitsView", { osparc.data.Resources.fetch("nodesInStudyResources", "put", params) .then(() => { osparc.FlashMessenger.getInstance().logAs(this.tr("Limits successfully updated")); - this.fireEvent("limitsChanged"); }) .catch(err => { console.error(err); diff --git a/services/static-webserver/client/source/class/osparc/notification/RibbonNotifications.js b/services/static-webserver/client/source/class/osparc/notification/RibbonNotifications.js index 1cbe3b5f7ea7..b2ea90b2b8eb 100644 --- a/services/static-webserver/client/source/class/osparc/notification/RibbonNotifications.js +++ b/services/static-webserver/client/source/class/osparc/notification/RibbonNotifications.js @@ -97,15 +97,14 @@ qx.Class.define("osparc.notification.RibbonNotifications", { if (notification.getType() === "announcement") { const dontShowButton = new qx.ui.form.Button(this.tr("Don't show again")).set({ - backgroundColor: "transparent", - textColor: "strong-text", + appearance: "strong-button", alignY: "middle", padding: 4, allowGrowX: false, allowGrowY: false, marginLeft: 15 }); - osparc.utils.Utils.addBorder(dontShowButton, 1, qx.theme.manager.Color.getInstance().resolve("strong-text")); + osparc.utils.Utils.addBorder(dontShowButton, 1, qx.theme.manager.Color.getInstance().resolve("text")); dontShowButton.addListener("tap", () => { this.removeNotification(notification); osparc.utils.Utils.localCache.setDontShowAnnouncement(notification.announcementId); diff --git a/services/static-webserver/client/source/class/osparc/theme/ColorDark.js b/services/static-webserver/client/source/class/osparc/theme/ColorDark.js index ca275a2371d4..fda2ccd25a48 100644 --- a/services/static-webserver/client/source/class/osparc/theme/ColorDark.js +++ b/services/static-webserver/client/source/class/osparc/theme/ColorDark.js @@ -2,29 +2,27 @@ qx.Theme.define("osparc.theme.ColorDark", { include: osparc.theme.mixin.Color, colors: { + // 105-0 "c00": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 105), - "c01": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 100), - "c02": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 95), - "c03": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 85), - "c04": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 80), - "c05": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 70), - "c06": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 55), - "c07": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 45), - "c08": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 35), - "c09": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 30), - "c10": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 25), - "c11": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 20), - "c12": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 15), - "c13": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 8), - "c14": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 0), + "c01": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 105-5), + "c02": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 105-10), + "c03": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 105-20), + "c04": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 105-25), + "c05": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 105-35), + "c06": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 105-50), + "c07": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 105-60), + "c08": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 105-70), + "c09": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 105-75), + "c10": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 105-80), + "c12": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 105-90), + "c14": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 105-105), "product-color": "rgba(0, 144, 208, 1)", // override in product "strong-main": "product-color", - "strong-text": "rgba(255, 255, 255, 1)", "a-bit-transparent": "rgba(0, 0, 0, 0.4)", // main - "background-main": "#222", + "background-main": "c01", "background-main-1": "c02", "background-main-2": "c03", "background-main-3": "c04", @@ -34,10 +32,7 @@ qx.Theme.define("osparc.theme.ColorDark", { "background-card-overlay": "rgba(25, 33, 37, 0.8)", "background-workspace-card-overlay": "rgb(35, 93, 122)", - "primary-background-color": "rgba(0, 20, 46, 1)", "navigation_bar_background_color": "rgba(1, 18, 26, 0.8)", - "tab_navigation_bar_background_color": "c00", - "modal-backdrop": "rgba(8, 9, 13, 1)", "fab_text": "contrasted-text-dark", "fab-background": "rgba(255, 255, 255, 0.2)", "input_background": "#213248", @@ -58,18 +53,18 @@ qx.Theme.define("osparc.theme.ColorDark", { "link": "rgba(10, 182, 255, 1)", // shadows - "bg-shadow": "background-main-5", - "box-shadow": "rgba(0,0,0, 0.15)", + "bg-shadow": "background-main-5", + "box-shadow": "rgba(0, 0, 0, 0.15)", "shadow": qx.core.Environment.get("css.rgba") ? "a-bit-transparent" : "bg-shadow", // window "window-popup-background": "rgba(66, 66, 66, 1)", "window-caption-background": "background-main", - "window-caption-background-active": "background-main-3", + "window-caption-background-active": "background-main-3", "window-caption-text": "text", "window-caption-text-active": "c12", - "window-border": "background-main-2", - "window-border-inner": "background-main-1", + "window-border": "background-main-2", + "window-border-inner": "background-main-1", // material-button "material-button-background": "fab-background", @@ -88,10 +83,10 @@ qx.Theme.define("osparc.theme.ColorDark", { // backgrounds "background-selected": "default-button-background", - "background-selected-disabled": "default-button-disabled", - "background-selected-dark": "product-color", + "background-selected-disabled": "default-button-disabled", + "background-selected-dark": "product-color", "background-disabled": "background-main", - "background-disabled-checked": "background-main-1", + "background-disabled-checked": "background-main-1", "background-pane": "background-main", // tabview @@ -102,23 +97,23 @@ qx.Theme.define("osparc.theme.ColorDark", { "tabview-button-background": "transparent", // scrollbar - "scrollbar-passive": "background-main-4", - "scrollbar-active": "background-main-5", + "scrollbar-passive": "background-main-4", + "scrollbar-active": "background-main-5", // form "button": "background-main-4", - "button-border": "background-main-5", + "button-border": "background-main-5", "button-border-hovered": "c07", - "button-box": "background-main-3", - "button-box-pressed": "background-main-4", + "button-box": "background-main-3", + "button-box-pressed": "background-main-4", "border-lead": "c07", // group box - "white-box-border": "background-main-2", + "white-box-border": "background-main-2", // borders // 'border-main' is an alias of 'background-selected' (compatibility reasons) - "border": "background-main-3", + "border": "background-main-3", "border-focused": "c09", "border-invalid": "failed-red", "border-disabled": "background-main", @@ -134,13 +129,13 @@ qx.Theme.define("osparc.theme.ColorDark", { "table-header": "background-main", "table-header-foreground": "c09", "table-header-border": "c07", - "table-focus-indicator": "background-main-5", + "table-focus-indicator": "background-main-5", // used in table code "table-header-cell": "background-main", - "table-row-background-focused-selected": "background-main-4", - "table-row-background-focused": "background-main-3", - "table-row-background-selected": "background-main-4", + "table-row-background-focused-selected": "background-main-4", + "table-row-background-focused": "background-main-3", + "table-row-background-selected": "background-main-4", "table-row-background-even": "background-main", "table-row-background-odd": "background-main", @@ -156,11 +151,11 @@ qx.Theme.define("osparc.theme.ColorDark", { "progressive-table-header": "c08", "progressive-table-row-background-even": "background-main", "progressive-table-row-background-odd": "background-main", - "progressive-progressbar-background": "background-main", + "progressive-progressbar-background": "background-main", "progressive-progressbar-indicator-done": "background-main", - "progressive-progressbar-indicator-undone": "background-main-1", - "progressive-progressbar-percent-background": "background-main", - "progressive-progressbar-percent-text": "background-main-1", + "progressive-progressbar-indicator-undone": "background-main-1", + "progressive-progressbar-percent-background": "background-main", + "progressive-progressbar-percent-text": "background-main-1", @@ -168,6 +163,8 @@ qx.Theme.define("osparc.theme.ColorDark", { "workbench-edge-comp-active": "#777777", "workbench-edge-api-active": "#BBBBBB", "workbench-start-hint": "#505050", + "workbench-view-navbar": "c00", + "workbench-view-splitter": "#000000", "node-background": "rgba(113, 157, 181, 0.5)", "node-selected-background": "strong-main", diff --git a/services/static-webserver/client/source/class/osparc/theme/ColorLight.js b/services/static-webserver/client/source/class/osparc/theme/ColorLight.js index 54f1e83d0ea0..c1a6bfb5783a 100644 --- a/services/static-webserver/client/source/class/osparc/theme/ColorLight.js +++ b/services/static-webserver/client/source/class/osparc/theme/ColorLight.js @@ -2,29 +2,27 @@ qx.Theme.define("osparc.theme.ColorLight", { include: osparc.theme.mixin.Color, colors: { + // 0-105 "c00": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 0), - "c01": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 8), - "c02": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 15), - "c03": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 25), - "c04": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 35), - "c05": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 45), - "c06": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 55), - "c07": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 60), - "c08": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 65), - "c09": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 70), - "c10": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 80), - "c11": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 85), - "c12": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 95), - "c13": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 100), - "c14": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 105), + "c01": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 0+5), + "c02": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 0+10), + "c03": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 0+20), + "c04": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 0+25), + "c05": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 0+35), + "c06": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 0+50), + "c07": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 0+60), + "c08": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 0+70), + "c09": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 0+75), + "c10": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 0+80), + "c12": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 0+90), + "c14": osparc.theme.colorProvider.ColorProvider.getColor("color.scales.static.base", 0+105), "product-color": "rgba(0, 144, 208, 1)", // override in product "strong-main": "product-color", - "strong-text": "background-main-1", "a-bit-transparent": "rgba(255, 255, 255, 0.4)", // main - "background-main": "rgba(250,250,250, 1)", // Is manipulated + "background-main": "c01", "background-main-1": "c02", "background-main-2": "c03", "background-main-3": "c04", @@ -34,12 +32,9 @@ qx.Theme.define("osparc.theme.ColorLight", { "background-card-overlay": "rgba(229, 229, 229, 0.8)", "background-workspace-card-overlay": "rgb(165, 223, 252)", - "primary-background-color": "rgba(255, 255, 255, 1)", "navigation_bar_background_color": "rgba(229, 229, 229, 0.8)", - "tab_navigation_bar_background_color": "c00", - "modal-backdrop": "rgba(247, 248, 252, 0.4)", "fab_text": "contrasted-text-dark", - "fab-background": "rgba(255, 255, 255, 1)", + "fab-background": "rgba(255, 255, 255, 0.2)", "input_background": "rgba(209, 214, 218, 1)", "input_background_disable": "rgba(113, 157, 181, 0.04)", "hint-background": "rgba(201, 201, 201, 1)", @@ -58,24 +53,25 @@ qx.Theme.define("osparc.theme.ColorLight", { "link": "rgba(10, 182, 255, 1)", // shadows - "bg-shadow": "background-main-5", - "box-shadow": "rgba(0,0,0, 0.15)", + "bg-shadow": "background-main-5", + "box-shadow": "rgba(0, 0, 0, 0.15)", "shadow": qx.core.Environment.get("css.rgba") ? "a-bit-transparent" : "bg-shadow", // window - "window-popup-background": "rgba(255, 255, 255, 1)", + // OM here + "window-popup-background": "rgba(225, 225, 225, 1)", "window-caption-background": "background-main", - "window-caption-background-active": "background-main-3", + "window-caption-background-active": "background-main-3", "window-caption-text": "text", "window-caption-text-active": "c12", - "window-border": "background-main-2", - "window-border-inner": "background-main-1", + "window-border": "background-main-2", + "window-border-inner": "background-main-1", // material-button - "material-button-background": "fab-background", - "material-button-background-disabled": "default-button-disabled-background", - "material-button-background-hovered": "default-button-hover-background", - "material-button-background-pressed": "default-button-active-background", + "material-button-background": "fab-background", + "material-button-background-disabled": "default-button-disabled-background", + "material-button-background-hovered": "default-button-hover-background", + "material-button-background-pressed": "default-button-active-background", "material-button-text-disabled": "default-button-disabled-background", "material-button-text": "default-button-text-outline", @@ -88,43 +84,43 @@ qx.Theme.define("osparc.theme.ColorLight", { // backgrounds "background-selected": "default-button-background", - "background-selected-disabled": "default-button-disabled", - "background-selected-dark": "product-color", + "background-selected-disabled": "default-button-disabled", + "background-selected-dark": "product-color", "background-disabled": "background-main", - "background-disabled-checked": "background-main-1", + "background-disabled-checked": "background-main-1", "background-pane": "background-main", // tabview "tabview-unselected": "c14", - "tabview-button-border": "c14", + "tabview-button-border": "product-color", "tabview-label-active-disabled": "c10", "tabview-pane-background": "transparent", "tabview-button-background": "transparent", // scrollbar - "scrollbar-passive": "background-main-4", - "scrollbar-active": "background-main-5", + "scrollbar-passive": "background-main-4", + "scrollbar-active": "background-main-5", // form - "button": "background-main-4", - "button-border": "background-main-5", + "button": "background-main-4", + "button-border": "background-main-5", "button-border-hovered": "c07", - "button-box": "background-main-3", - "button-box-pressed": "background-main-4", + "button-box": "background-main-3", + "button-box-pressed": "background-main-4", "border-lead": "c07", // group box - "white-box-border": "background-main-2", + "white-box-border": "background-main-2", // borders // 'border-main' is an alias of 'background-selected' (compatibility reasons) - "border": "background-main-3", + "border": "background-main-3", "border-focused": "c09", "border-invalid": "failed-red", "border-disabled": "background-main", // separator - "border-separator": "fab-background", + "border-separator": "background-main-3", // tooltip "tooltip": "flash_message_bg", @@ -135,13 +131,13 @@ qx.Theme.define("osparc.theme.ColorLight", { "table-header": "background-main", "table-header-foreground": "c09", "table-header-border": "c07", - "table-focus-indicator": "background-main-5", + "table-focus-indicator": "background-main-5", // used in table code "table-header-cell": "background-main", - "table-row-background-focused-selected": "background-main-4", - "table-row-background-focused": "background-main-3", - "table-row-background-selected": "background-main-4", + "table-row-background-focused-selected": "background-main-4", + "table-row-background-focused": "background-main-3", + "table-row-background-selected": "background-main-4", "table-row-background-even": "background-main", "table-row-background-odd": "background-main", @@ -157,17 +153,19 @@ qx.Theme.define("osparc.theme.ColorLight", { "progressive-table-header": "c08", "progressive-table-row-background-even": "background-main", "progressive-table-row-background-odd": "background-main", - "progressive-progressbar-background": "background-main", + "progressive-progressbar-background": "background-main", "progressive-progressbar-indicator-done": "background-main", - "progressive-progressbar-indicator-undone": "background-main-1", - "progressive-progressbar-percent-background": "background-main", - "progressive-progressbar-percent-text": "background-main-1", + "progressive-progressbar-indicator-undone": "background-main-1", + "progressive-progressbar-percent-background": "background-main", + "progressive-progressbar-percent-text": "background-main-1", // OSPARC "workbench-edge-comp-active": "#888888", "workbench-edge-api-active": "#444444", "workbench-start-hint": "#AFAFAF", + "workbench-view-navbar": "c02", + "workbench-view-splitter": "background-main-3", "node-background": "rgba(113, 157, 181, 0.35)", "node-selected-background": "strong-main", diff --git a/services/static-webserver/client/source/class/osparc/widget/NodeOptions.js b/services/static-webserver/client/source/class/osparc/widget/NodeOptions.js index 180de5bb2cb7..7cf743845894 100644 --- a/services/static-webserver/client/source/class/osparc/widget/NodeOptions.js +++ b/services/static-webserver/client/source/class/osparc/widget/NodeOptions.js @@ -33,12 +33,6 @@ qx.Class.define("osparc.widget.NodeOptions", { this.setNode(node); }, - events: { - "versionChanged": "qx.event.type.Event", - "bootModeChanged": "qx.event.type.Event", - "limitsChanged": "qx.event.type.Event" - }, - properties: { node: { check: "osparc.data.model.Node", @@ -74,7 +68,6 @@ qx.Class.define("osparc.widget.NodeOptions", { (node.isUpdatable() || node.isDeprecated() || node.isRetired()) ) { const lifeCycleView = new osparc.node.LifeCycleView(node); - node.addListener("versionChanged", () => this.fireEvent("versionChanged")); sections.push(lifeCycleView); showStartStopButton = true; @@ -83,7 +76,6 @@ qx.Class.define("osparc.widget.NodeOptions", { // Boot Options if (node.hasBootModes()) { const bootOptionsView = new osparc.node.BootOptionsView(node); - node.addListener("bootModeChanged", () => this.fireEvent("bootModeChanged")); sections.push(bootOptionsView); showStartStopButton = true; @@ -95,7 +87,6 @@ qx.Class.define("osparc.widget.NodeOptions", { (node.isComputational() || node.isDynamic()) ) { const updateResourceLimitsView = new osparc.node.UpdateResourceLimitsView(node); - node.addListener("limitsChanged", () => this.fireEvent("limitsChanged")); sections.push(updateResourceLimitsView); showStartStopButton |= node.isDynamic(); diff --git a/services/static-webserver/client/source/class/osparc/workbench/DiskUsageIndicator.js b/services/static-webserver/client/source/class/osparc/workbench/DiskUsageIndicator.js index 173b36895242..e733be3b6bcf 100644 --- a/services/static-webserver/client/source/class/osparc/workbench/DiskUsageIndicator.js +++ b/services/static-webserver/client/source/class/osparc/workbench/DiskUsageIndicator.js @@ -172,7 +172,7 @@ qx.Class.define("osparc.workbench.DiskUsageIndicator", { toolTipText += this.tr("Data storage: ") + osparc.utils.Utils.bytesToSize(diskVolsUsage.free) + "
"; toolTipText += this.tr("I/O storage: ") + osparc.utils.Utils.bytesToSize(diskHostUsage.free) + "
"; } - const bgColor = qx.theme.manager.Color.getInstance().resolve("tab_navigation_bar_background_color"); + const bgColor = qx.theme.manager.Color.getInstance().resolve("workbench-view-navbar"); const color2 = qx.theme.manager.Color.getInstance().resolve("progressive-progressbar-background"); indicator.getContentElement().setStyles({ "background-color": bgColor,