Skip to content

Commit

Permalink
Merge pull request #44 from odeimaiz/feature/light-theme
Browse files Browse the repository at this point in the history
Light blue and Purple
  • Loading branch information
odeimaiz authored Sep 11, 2020
2 parents 8e9193c + 6aa99f3 commit 3755b2d
Show file tree
Hide file tree
Showing 16 changed files with 4,044 additions and 3,382 deletions.
7 changes: 4 additions & 3 deletions Manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"email": "[email protected]"
}
],
"version": "0.5.5"
"version": "0.5.6"
},
"provides": {
"namespace": "osparc.theme",
Expand All @@ -21,9 +21,10 @@
"translation": "source/translation"
},
"requires": {
"ITISFoundation/qx-iconfont-material": "^0.1.4",
"@qooxdoo/compiler": "^1.0.0-beta",
"@qooxdoo/framework": "^6.0.0-beta"
"@qooxdoo/framework": "^6.0.0-beta",
"ITISFoundation/qx-iconfont-material": "^0.1.5",
"ITISFoundation/qx-iconfont-fontawesome5": "^0.2.0"
},
"$schema": "https://raw.githubusercontent.com/qooxdoo/qooxdoo-compiler/master/source/resource/qx/tool/schema/Manifest-1-0-0.json"
}
4 changes: 3 additions & 1 deletion compile.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@
"include": [
"osparc.theme.OSparcLight",
"osparc.theme.OSparcPortal",
"osparc.theme.OSparcBlue"
"osparc.theme.OSparcBlue",
"osparc.theme.LightBlue",
"osparc.theme.Purple"
],
"parts": {
"boot": {
Expand Down
6,875 changes: 3,617 additions & 3,258 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"devDependencies": {
"@qooxdoo/compiler": "^1.0.0-beta.20200326-1746",
"babel-eslint": "^8.2.6",
"eslint": "^4.19.1",
"@qooxdoo/compiler": "^1.0.0-beta.20200424-1525",
"babel-eslint": "^10.1.0",
"eslint": "^6.8.0",
"eslint-config-qx": "^0.1.0",
"eslint-plugin-qx-rules": "^0.1.0"
},
"scripts": {
"lint": "eslint ./source/class/osparc/**/*.js",
"build": "npx qx compile --target=source"
},
"preferGlobal": "false"
"preferGlobal": false
}
10 changes: 9 additions & 1 deletion qx-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,15 @@
"uri": "ITISFoundation/qx-iconfont-material",
"repo_name": "ITISFoundation/qx-iconfont-material",
"repo_tag": "v0.1.5"
},
{
"library_name": "qx-iconfont-fontawesome5",
"library_version": "0.2.0",
"path": "qx_packages/ITISFoundation_qx-iconfont-fontawesome5_v0_2_0",
"uri": "ITISFoundation/qx-iconfont-fontawesome5",
"repo_name": "ITISFoundation/qx-iconfont-fontawesome5",
"repo_tag": "v0.2.0"
}
],
"version": "2.1.0"
}
}
31 changes: 31 additions & 0 deletions source/class/osparc/theme/LightBlue.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/* ************************************************************************
OSparc Light Blue Theme for Qooxdoo
Copyright:
2020 IT'IS Foundation
License:
MIT: https://opensource.org/licenses/MIT
See the LICENSE file in the project's top-level directory for details.
Authors:
* Odei Maiz (odeimaiz)
Origin:
This theme is based in large parts on the the Simple
theme included with Qooxdoo.
************************************************************************ */
/**
* Simple Theme
*/
qx.Theme.define("osparc.theme.LightBlue", {
title: "Light Blue Theme",
meta: {
color: osparc.theme.lightblue.Color,
decoration: osparc.theme.common.Decoration,
font: osparc.theme.common.Font,
appearance: osparc.theme.common.Appearance,
icon: qx.theme.icon.Tango
}
});
2 changes: 1 addition & 1 deletion source/class/osparc/theme/OSparcPortal.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* Simple Theme
*/
qx.Theme.define("osparc.theme.OSparcPortal", {
title: "OSparc Light Theme",
title: "OSparc Portal Theme",
meta: {
color: osparc.theme.osparcportal.Color,
decoration: osparc.theme.common.Decoration,
Expand Down
31 changes: 31 additions & 0 deletions source/class/osparc/theme/Purple.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/* ************************************************************************
OSparc Purple Theme for Qooxdoo
Copyright:
2020 IT'IS Foundation
License:
MIT: https://opensource.org/licenses/MIT
See the LICENSE file in the project's top-level directory for details.
Authors:
* Odei Maiz (odeimaiz)
Origin:
This theme is based in large parts on the the Simple
theme included with Qooxdoo.
************************************************************************ */
/**
* Simple Theme
*/
qx.Theme.define("osparc.theme.Purple", {
title: "Purple Theme",
meta: {
color: osparc.theme.purple.Color,
decoration: osparc.theme.common.Decoration,
font: osparc.theme.common.Font,
appearance: osparc.theme.common.Appearance,
icon: qx.theme.icon.Tango
}
});
4 changes: 2 additions & 2 deletions source/class/osparc/theme/common/Appearance.js
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ qx.Theme.define("osparc.theme.common.Appearance", {
"splitpane/splitter":
{
style: function(states) {
return {backgroundColor: "light-background"};
return {backgroundColor: "contrasted-background"};
}
},

Expand Down Expand Up @@ -2596,7 +2596,7 @@ qx.Theme.define("osparc.theme.common.Appearance", {
style: function(states) {
return {
padding: [0, 10, 10, 10],
backgroundColor: "light-background"
backgroundColor: "contrasted-background"
};
}
}
Expand Down
146 changes: 146 additions & 0 deletions source/class/osparc/theme/lightblue/Color.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
/* ************************************************************************
Light Blue based theme for Qooxdoo
Copyright:
2020 IT'IS Foundation
License:
MIT: https://opensource.org/licenses/MIT
See the LICENSE file in the project's top-level directory for details.
Authors:
* Odei Maiz (odeimaiz)
Origin:
This theme is based in large parts on the the Simple
theme included with Qooxdoo.
************************************************************************ */
/**
* Light Blue color theme based on the the light theme
*/
qx.Theme.define("osparc.theme.lightblue.Color", {
colors: {
// main
"background-main": "#FFFFFF", // background
"background-main-lighter": "#D8E3F1", // navbar bg
"background-main-lighter+": "#BFCAD8", // dashboard button
"contrasted-background": "#9CAFC9", // dashboard button hovered
"contrasted-background+": "#8396B0", // dashboard button pressed

// text
"text": "#404040",
"text-disabled": "#7F7F7F",
"text-selected": "#0F0F0F",
"text-placeholder": "text-disabled",
"text-darker": "text-disabled",
"contrasted-text-dark": "#DDDDDD",
"contrasted-text-light": "#111111",
"link": "#555555",

// shadows
"bg-shadow": "#999999",
"shadow": qx.core.Environment.get("css.rgba") ? "rgba(1.0, 1.0, 1.0, 0.4)" : "bg-shadow",

// window
"window-caption-background": "background-main",
"window-caption-background-active": "contrasted-background",
"window-caption-text": "text",
"window-caption-text-active": "text-selected",

// material-button
"material-button-background": "background-main-lighter+",
"material-button-background-disabled": "background-main-lighter",
"material-button-background-hovered": "contrasted-background+",
"material-button-background-pressed": "contrasted-background+",
"material-button-text-disabled": "text-disabled",
"material-button-text": "text",

// material-textfield
"material-textfield": "text-disabled",
"material-textfield-focused": "#1F1F1F",
"material-textfield-disabled": "contrasted-background+",
"material-textfield-invalid": "#5FBFBF",
"invalid": "material-textfield-invalid",

// backgrounds
"background-selected": "contrasted-background+",
"background-selected-disabled": "background-main-lighter",
"background-selected-dark": "contrasted-background",
"background-disabled": "background-main",
"background-disabled-checked": "background-main-lighter",
"background-pane": "background-main",

// tabview
"tabview-unselected": "#000000",
"tabview-button-border": "#000000",
"tabview-label-active-disabled": "#262626",
"tabview-pane-background": "background-main",
"tabview-button-background": "transparent",

// scrollbar
"scrollbar-passive": "background-main-lighter",
"scrollbar-active": "contrasted-background",

// form
"button": "contrasted-background+",
"button-border": "bg-shadow",
"button-border-hovered": "#777777",
"button-box": "contrasted-background",
"button-box-pressed": "contrasted-background+",
"border-lead": "#777777",

// window
"window-border": "contrasted-background",
"window-border-inner": "background-main",

// group box
"white-box-border": "#BFBFBF",

// borders
// 'border-main' is an alias of 'background-selected' (compatibility reasons)
"border": "#B7B7B7",
"border-focused": "#484848",
"border-invalid": "material-textfield-invalid",
"border-disabled": "background-main",

// separator
"border-separator": "text-disabled",

// tooltip
"tooltip": "text-disabled",
"tooltip-text": "text-selected",

// table
"table-header": "background-main",
"table-header-foreground": "text",
"table-header-border": "#777777",
"table-focus-indicator": "#8A8A8A",

// used in table code
"table-header-cell": "background-main",
"table-row-background-focused-selected": "#A9A9A9",
"table-row-background-focused": "#BABABA",
"table-row-background-selected": "#A9A9A9",
"table-row-background-even": "background-main",
"table-row-background-odd": "background-main-lighter",

// foreground
"table-row-selected": "text-selected",
"table-row": "text",

// table grid color
"table-row-line": "background-main",
"table-column-line": "background-main",

// used in progressive code
"progressive-table-header": "#555555",
"progressive-table-row-background-even": "background-main",
"progressive-table-row-background-odd": "background-main-lighter",
"progressive-progressbar-background": "#FFFFFF",
"progressive-progressbar-indicator-done": "background-main",
"progressive-progressbar-indicator-undone": "background-main-lighter",
"progressive-progressbar-percent-background": "#FFFFFF",
"progressive-progressbar-percent-text": "background-main-lighter"
}
});
50 changes: 8 additions & 42 deletions source/class/osparc/theme/osparcblue/Color.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ qx.Theme.define("osparc.theme.osparcblue.Color", {
"secondary-color": "#cfd8dc",
"secondary-color-light": "#ffffff",
"secondary-color-dark": "#9ea7aa",
"light-background": "#ffffff",
"contrasted-background": "#ffffff",
"invalid-color": "#a04040",
"text": "#000000",
"text-disabled": "#bbb",
Expand Down Expand Up @@ -64,9 +64,9 @@ qx.Theme.define("osparc.theme.osparcblue.Color", {
"background-selected": "primary-color",
"background-selected-disabled": "secondary-color-dark",
"background-selected-dark": "primary-color-dark",
"background-disabled": "light-background",
"background-disabled-checked": "light-background",
"background-pane": "light-background",
"background-disabled": "contrasted-background",
"background-disabled-checked": "contrasted-background",
"background-pane": "contrasted-background",

// tabview
"tabview-unselected": "#1866B5",
Expand Down Expand Up @@ -116,19 +116,19 @@ qx.Theme.define("osparc.theme.osparcblue.Color", {
"tooltip-text": "#f0f0f0",

// table
"table-header": "light-background",
"table-header": "contrasted-background",
"table-header-foreground": "text",
"table-header-border": "primary-color-dark",
"table-focus-indicator": "primary-color-dark",

// used in table code
"table-header-cell": "light-background",
"table-header-cell": "contrasted-background",

"table-row-background-focused-selected": "primary-color",
"table-row-background-focused": "primary-color",
"table-row-background-selected": "primary-color-light",
"table-row-background-even": "secondary-color",
"table-row-background-odd": "light-background",
"table-row-background-odd": "contrasted-background",
// foreground
"table-row-selected": "#ffffff",
"table-row": "text",
Expand All @@ -144,40 +144,6 @@ qx.Theme.define("osparc.theme.osparcblue.Color", {
"progressive-progressbar-indicator-done": "#222",
"progressive-progressbar-indicator-undone": "#333",
"progressive-progressbar-percent-background": "#000",
"progressive-progressbar-percent-text": "#333",


/*
---------------------------------------------------------------------------
OSPARC RELATED
---------------------------------------------------------------------------
*/
"workbench-edge-comp-active": "#888888",
"workbench-edge-api-active": "#444444",
"workbench-edge-selected": "#FFFF00",
"workbench-start-hint": "#AFAFAF",

"node-selected-background": "#999999",
"node-title-text": "#232323",
"node-port-text": "#454545",

"logger-debug-message": "#000000",
"logger-info-message": "#000000",
"logger-warning-message": "#FFFF00",
"logger-error-message": "#FF0000",

"service-window-hint": "#7F7F7F",

"activitytree-background-cpu": "#D38331",
"activitytree-background-memory": "#CA7B8A",

"ready-green": "#33925A",
"failed-red": "#FF2D2D",

"progressbar": "#9F6F61",

"loading-page-background-color": "background-main",
"loading-page-text": "#000000",
"loading-page-spinner": "#222222"
"progressive-progressbar-percent-text": "#333"
}
});
Loading

0 comments on commit 3755b2d

Please sign in to comment.