Skip to content

Commit 8957e53

Browse files
authored
TI Planning uses ZMT color palette (ITISFoundation#2863)
1 parent 06a8c02 commit 8957e53

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+6343
-377
lines changed

services/web/client/compile.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
},
3838
{
3939
"class": "osparc.Application",
40-
"theme": "osparc.theme.ThemeLightBlue",
40+
"theme": "osparc.theme.zmt.ThemeDark",
4141
"name": "s4l",
4242
"title": "Sim4Life",
4343
"include": [
4444
"iconfont.material.Load",
4545
"iconfont.fontawesome5.Load",
46-
"osparc.theme.ThemeDark"
46+
"osparc.theme.zmt.ThemeLight"
4747
],
4848
"environment": {
4949
"product.name": "s4l"
@@ -52,12 +52,13 @@
5252
},
5353
{
5454
"class": "osparc.Application",
55-
"theme": "osparc.theme.ThemePurple",
55+
"theme": "osparc.theme.zmt.ThemeDark",
5656
"name": "tis",
57-
"title": "TI Treatment Planning",
57+
"title": "TI Planning",
5858
"include": [
5959
"iconfont.material.Load",
60-
"iconfont.fontawesome5.Load"
60+
"iconfont.fontawesome5.Load",
61+
"osparc.theme.zmt.ThemeLight"
6162
],
6263
"environment": {
6364
"product.name": "tis"

services/web/client/source/class/osparc/About.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,18 +59,18 @@ qx.Class.define("osparc.About", {
5959
contentPaddingLeft: 0,
6060
barPosition: "top"
6161
});
62-
tabView.getChildControl("pane").setBackgroundColor("material-button-background");
62+
tabView.getChildControl("pane").setBackgroundColor("background-main-2");
6363
this.add(tabView, {
6464
flex: 1
6565
});
6666

6767
const frontendPage = new qx.ui.tabview.Page(this.tr("Front-end")).set({
6868
layout: new qx.ui.layout.VBox(5),
69-
backgroundColor: "material-button-background"
69+
backgroundColor: "background-main-2"
7070
});
7171
const backendPage = new qx.ui.tabview.Page(this.tr("Back-end")).set({
7272
layout: new qx.ui.layout.VBox(5),
73-
backgroundColor: "material-button-background"
73+
backgroundColor: "background-main-2"
7474
});
7575
tabView.add(frontendPage);
7676
tabView.add(backendPage);

services/web/client/source/class/osparc/component/form/tag/TagItem.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,14 @@ qx.Class.define("osparc.component.form.tag.TagItem", {
193193
*/
194194
__tagItemButtons: function() {
195195
const buttonContainer = new qx.ui.container.Composite(new qx.ui.layout.HBox());
196-
const editButton = new qx.ui.form.Button(this.tr("Edit")).set({
197-
appearance: "link-button"
196+
const editButton = new qx.ui.form.Button().set({
197+
icon: "@FontAwesome5Solid/pencil-alt/12",
198+
toolTipText: this.tr("Edit")
198199
});
199-
const deleteButton = new osparc.ui.form.FetchButton(this.tr("Delete")).set({
200-
appearance: "link-button"
200+
const deleteButton = new osparc.ui.form.FetchButton().set({
201+
appearance: "danger-button",
202+
icon: "@FontAwesome5Solid/trash/12",
203+
toolTipText: this.tr("Delete")
201204
});
202205
buttonContainer.add(editButton);
203206
buttonContainer.add(deleteButton);

services/web/client/source/class/osparc/component/form/tag/TagManager.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,11 @@ qx.Class.define("osparc.component.form.tag.TagManager", {
5757
__selectedTags: null,
5858

5959
__renderLayout: function() {
60-
const filterBar = new qx.ui.toolbar.ToolBar();
6160
const filter = new osparc.component.filter.TextFilter("name", "studyBrowserTagManager").set({
6261
allowStretchX: true,
6362
margin: [0, 10, 5, 10]
6463
});
65-
filterBar.add(filter, {
66-
width: "100%"
67-
});
68-
this.add(filterBar);
64+
this.add(filter);
6965

7066
const buttonContainer = new qx.ui.container.Composite(new qx.ui.layout.VBox());
7167
this.add(buttonContainer, {

services/web/client/source/class/osparc/component/metadata/QualityEditor.js

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -600,37 +600,31 @@ qx.Class.define("osparc.component.metadata.QualityEditor", {
600600
// ANNOTATIONS //
601601

602602
__createEditBtns: function() {
603-
const editButton = new qx.ui.toolbar.Button(this.tr("Edit")).set({
604-
appearance: "toolbar-md-button"
605-
});
603+
const editButton = new qx.ui.form.Button(this.tr("Edit"));
606604
this.bind("mode", editButton, "visibility", {
607605
converter: value => value === "display" ? "visible" : "excluded"
608606
});
609607
editButton.addListener("execute", () => {
610608
this.setMode("edit");
611609
}, this);
612610

613-
const saveButton = new osparc.ui.toolbar.FetchButton(this.tr("Save")).set({
614-
appearance: "toolbar-md-button"
615-
});
611+
const saveButton = new osparc.ui.form.FetchButton(this.tr("Save"));
616612
this.bind("mode", saveButton, "visibility", {
617613
converter: value => value === "edit" ? "visible" : "excluded"
618614
});
619615
saveButton.addListener("execute", e => {
620616
this.__save(saveButton);
621617
}, this);
622618

623-
const cancelButton = new qx.ui.toolbar.Button(this.tr("Cancel")).set({
624-
appearance: "toolbar-md-button"
625-
});
619+
const cancelButton = new qx.ui.form.Button(this.tr("Cancel"));
626620
this.bind("mode", cancelButton, "visibility", {
627621
converter: value => value === "edit" ? "visible" : "excluded"
628622
});
629623
cancelButton.addListener("execute", () => {
630624
this.setMode("display");
631625
}, this);
632626

633-
const buttonsToolbar = new qx.ui.toolbar.ToolBar();
627+
const buttonsToolbar = new qx.ui.container.Composite(new qx.ui.layout.HBox(10));
634628
buttonsToolbar.add(editButton);
635629
buttonsToolbar.add(saveButton);
636630
buttonsToolbar.add(cancelButton);

services/web/client/source/class/osparc/component/node/BaseNodeView.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ qx.Class.define("osparc.component.node.BaseNodeView", {
117117
});
118118

119119
const nodeStatusUI = this.__nodeStatusUI = new osparc.ui.basic.NodeStatusUI().set({
120-
backgroundColor: "contrasted-background+"
120+
backgroundColor: "background-main-4"
121121
});
122122
nodeStatusUI.getChildControl("label").setFont("text-14");
123123
header.add(nodeStatusUI);

services/web/client/source/class/osparc/component/permissions/Permissions.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ qx.Class.define("osparc.component.permissions.Permissions", {
112112
});
113113

114114
const addCollaboratorBtn = new qx.ui.form.Button(this.tr("Add")).set({
115+
appearance: "strong-button",
115116
allowGrowY: false,
116117
enabled: false
117118
});
@@ -139,7 +140,7 @@ qx.Class.define("osparc.component.permissions.Permissions", {
139140
spacing: 3,
140141
width: 150,
141142
padding: 0,
142-
backgroundColor: "material-button-background"
143+
backgroundColor: "background-main-2"
143144
});
144145

145146
const collaboratorsModel = this.__collaboratorsModel = new qx.data.Array();

services/web/client/source/class/osparc/component/snapshots/IterationsView.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ qx.Class.define("osparc.component.snapshots.IterationsView", {
240240

241241
__createDeleteIterationBtn: function() {
242242
const deleteIterationBtn = new qx.ui.form.Button(this.tr("Delete")).set({
243+
appearance: "danger-button",
243244
allowGrowX: false,
244245
alignX: "left"
245246
});

services/web/client/source/class/osparc/component/study/SaveAsTemplate.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ qx.Class.define("osparc.component.study.SaveAsTemplate", {
5858
this._add(publishWithdData);
5959

6060
const shareResourceBtn = new osparc.ui.form.FetchButton().set({
61+
appearance: "strong-button",
6162
label: this.tr("Publish"),
6263
allowGrowX: false,
6364
alignX: "right"

services/web/client/source/class/osparc/component/widget/NodeTreeItem.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ qx.Class.define("osparc.component.widget.NodeTreeItem", {
134134
}
135135
case "options-delete-button": {
136136
control = new qx.ui.menu.Button().set({
137+
appearance: "danger-button",
137138
label: this.tr("Delete"),
138139
icon: "@FontAwesome5Solid/trash/10"
139140
});

0 commit comments

Comments
 (0)