Skip to content

🎨 [Frontend] Team Black feedback 20.06 #5971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jun 20, 2024
Merged

🎨 [Frontend] Team Black feedback 20.06 #5971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f36d71a
minor
odeimaiz Jun 20, 2024
7631777
typo
odeimaiz Jun 20, 2024
aa8a21e
Autostart services, larger font and tooltiptext
odeimaiz Jun 20, 2024
bf4e225
remove the text of the three options
odeimaiz Jun 20, 2024
e9c7233
separator in secondary column
odeimaiz Jun 20, 2024
902d90f
minor
odeimaiz Jun 20, 2024
459b7de
Merge branch 'master' into enh/minors
odeimaiz Jun 20, 2024
826c226
Merge branch 'master' into enh/minors
odeimaiz Jun 20, 2024
42fc27f
Merge branch 'master' into enh/minors
odeimaiz Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,10 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
this.getChildControl("side-panel-right-tabs").setSelection([this.__serviceOptionsPage]);

const spacing = 8;
const vBox = new qx.ui.container.Composite(new qx.ui.layout.VBox(spacing*2));
const vBox = new qx.ui.container.Composite(new qx.ui.layout.VBox().set({
separator: "separator-vertical",
spacing: spacing*2
}));

// INPUTS FORM
if (node.isPropertyInitialized("propsForm") && node.getPropsForm()) {
Expand Down
10 changes: 1 addition & 9 deletions services/static-webserver/client/source/class/osparc/file/FilePicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,15 +464,7 @@ qx.Class.define("osparc.file.FilePicker", {
},

__buildAppModeLayout: function() {
let msg = this.tr("In order to Select a File you have three options:");
const options = [
this.tr("- Upload a New File"),
this.tr("- Provide a File Link"),
this.tr("- Select a File from other ") + osparc.product.Utils.getStudyAlias()
];
for (let i=0; i<options.length; i++) {
msg += "<br>" + options[i];
}
const msg = this.tr("In order to Select a File you have three options:");
const intro = new qx.ui.basic.Label(msg).set({
font: "text-16",
rich: true
Expand Down
3 changes: 2 additions & 1 deletion services/static-webserver/client/source/class/osparc/form/renderer/PropForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,8 @@ qx.Class.define("osparc.form.renderer.PropForm", {
label: this.tr("Input"),
icon: "@FontAwesome5Solid/plus/14",
marginTop: 6,
allowGrowX: false
allowGrowX: false,
minWidth: 70
});
addPortButton.addListener("execute", () => this.__addInputPortButtonClicked());
this._add(addPortButton, {
Expand Down
3 changes: 2 additions & 1 deletion services/static-webserver/client/source/class/osparc/info/StudyUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,8 @@ qx.Class.define("osparc.info.StudyUtils", {
const cb = new qx.ui.form.CheckBox().set({
value: "disableServiceAutoStart" in devObj ? !devObj["disableServiceAutoStart"] : true,
label: qx.locale.Manager.tr("Autostart services"),
toolTipText: qx.locale.Manager.tr("This will help opening and closing studies faster"),
font: "text-14",
toolTipText: qx.locale.Manager.tr("Disabling this will help opening and closing studies/projects faster"),
iconPosition: "right"
});
cb.addListener("changeValue", e => {
Expand Down
2 changes: 1 addition & 1 deletion services/static-webserver/client/source/class/osparc/notification/NotificationsContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ qx.Class.define("osparc.notification.NotificationsContainer", {
maxHeight: 250,
backgroundColor: "background-main-3"
});
osparc.utils.Utils.setIdToWidget(this, "notificationsContainer");

const root = qx.core.Init.getApplication().getRoot();
root.add(this, {
Expand All @@ -37,7 +38,6 @@ qx.Class.define("osparc.notification.NotificationsContainer", {
});

const notificationsContainer = this.__container = new qx.ui.container.Composite(new qx.ui.layout.VBox(1));
osparc.utils.Utils.setIdToWidget(notificationsContainer, "notificationsContainer");
const scrollContainer = new qx.ui.container.Scroll();
scrollContainer.add(notificationsContainer);
this._add(scrollContainer, {
Expand Down
4 changes: 2 additions & 2 deletions services/static-webserver/client/source/class/osparc/workbench/WorkbenchUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
},

statics: {
getDashedBorderSytle(isRight) {
getDashedBorderStyle(isRight) {
const side = isRight ? "right" : "left";
const borderStyle = {};
borderStyle["background-image"] = `linear-gradient(to bottom, #3D3D3D 50%, rgba(255, 255, 255, 0) 0%)`;
Expand Down Expand Up @@ -273,7 +273,7 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
allowGrowX: false,
padding: [0, 6]
});
inputOutputNodesLayout.getContentElement().setStyles(this.self().getDashedBorderSytle(isInput));
inputOutputNodesLayout.getContentElement().setStyles(this.self().getDashedBorderStyle(isInput));
const title = new qx.ui.basic.Label(label).set({
alignX: "center",
margin: [15, 0],
Expand Down
Loading