diff --git a/services/static-webserver/client/Manifest.json b/services/static-webserver/client/Manifest.json index d0d68756545c..c9756e43a32a 100644 --- a/services/static-webserver/client/Manifest.json +++ b/services/static-webserver/client/Manifest.json @@ -36,7 +36,8 @@ "jsontreeviewer/jsonTree.css", "hint/hint.css", "marked/markdown.css", - "common/common.css" + "common/common.css", + "iconfont/fontawesome7/fa7-fonts.css" ] }, "requires": { diff --git a/services/static-webserver/client/source/class/osparc/Application.js b/services/static-webserver/client/source/class/osparc/Application.js index 92cf82c9eda6..83610a46b181 100644 --- a/services/static-webserver/client/source/class/osparc/Application.js +++ b/services/static-webserver/client/source/class/osparc/Application.js @@ -48,10 +48,13 @@ qx.Class.define("osparc.Application", { qx.log.appender.Native; } + osparc.iconfont.FontAwesome7.init(); + await this.__preloadCalls(); this.__preventAutofillBrowserStyles(); this.__loadCommonCss(); + this.__updateTabName(); if (osparc.utils.Utils.isDevelopmentPlatform()) { this.__updateMetaTags(); diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserFilter.js b/services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserFilter.js index 9f1d9528cd2e..a8529e70a050 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserFilter.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserFilter.js @@ -219,7 +219,9 @@ qx.Class.define("osparc.dashboard.ResourceBrowserFilter", { value: false, appearance: "filter-toggle-button", label: this.tr("Recently Deleted"), - icon: "@FontAwesome5Solid/trash-alt/16", + // icon: "@FontAwesome5Solid/trash-alt/16", + icon: "@FontAwesome7Brands/github/24", + // icon: "@FontAwesome7Brands/github", paddingLeft: 10, // align it with the context }); trashButton.addListener("changeValue", e => { diff --git a/services/static-webserver/client/source/class/osparc/iconfont/FontAwesome7.js b/services/static-webserver/client/source/class/osparc/iconfont/FontAwesome7.js new file mode 100644 index 000000000000..e647b30a838e --- /dev/null +++ b/services/static-webserver/client/source/class/osparc/iconfont/FontAwesome7.js @@ -0,0 +1,36 @@ +/* ************************************************************************ + + osparc - the simcore frontend + + https://osparc.io + + Copyright: + 2025 IT'IS Foundation, https://itis.swiss + + License: + MIT: https://opensource.org/licenses/MIT + + Authors: + * Odei Maiz (odeimaiz) + +************************************************************************ */ + +/** + * Ensures FA7 font-face declarations and webfonts + * are included in the build and loaded at runtime. + * + * @asset(iconfont/fontawesome7/fa7-fonts.css) + * @asset(iconfont/fontawesome7/webfonts/fa-brands-400.woff2) + */ + +qx.Class.define("osparc.iconfont.FontAwesome7", { + type: "static", + + statics: { + init: function() { + const path = "iconfont/fontawesome7/fa7-fonts.css"; + const uri = qx.util.ResourceManager.getInstance().toUri(path); + qx.module.Css.includeStylesheet(uri); + }, + } +}); diff --git a/services/static-webserver/client/source/class/osparc/info/StudyUtils.js b/services/static-webserver/client/source/class/osparc/info/StudyUtils.js index b616eb3a7094..a590abc06862 100644 --- a/services/static-webserver/client/source/class/osparc/info/StudyUtils.js +++ b/services/static-webserver/client/source/class/osparc/info/StudyUtils.js @@ -262,7 +262,7 @@ qx.Class.define("osparc.info.StudyUtils", { */ openAccessRights: function(studyData) { const permissionsView = new osparc.share.CollaboratorsStudy(studyData); - const title = qx.locale.Manager.tr("Share with Editors and Organizations"); + const title = qx.locale.Manager.tr("Share with Users and Organizations"); osparc.ui.window.Window.popUpInWindow(permissionsView, title, 500, 500); return permissionsView; }, diff --git a/services/static-webserver/client/source/resource/iconfont/fontawesome7/fa7-fonts.css b/services/static-webserver/client/source/resource/iconfont/fontawesome7/fa7-fonts.css new file mode 100644 index 000000000000..9e6cb86fb735 --- /dev/null +++ b/services/static-webserver/client/source/resource/iconfont/fontawesome7/fa7-fonts.css @@ -0,0 +1,20 @@ +@font-face { + font-family: "Font Awesome 7 Free"; + font-style: normal; + font-weight: 400; + src: url("webfonts/fa-regular-400.woff2") format("woff2"); +} + +@font-face { + font-family: "Font Awesome 7 Free"; + font-style: normal; + font-weight: 900; + src: url("webfonts/fa-solid-900.woff2") format("woff2"); +} + +@font-face { + font-family: "Font Awesome 7 Brands"; + font-style: normal; + font-weight: 400; + src: url("webfonts/fa-brands-400.woff2") format("woff2"); +} diff --git a/services/static-webserver/client/source/resource/iconfont/fontawesome7/webfonts/fa-brands-400.woff2 b/services/static-webserver/client/source/resource/iconfont/fontawesome7/webfonts/fa-brands-400.woff2 new file mode 100644 index 000000000000..d0b8f69e8942 Binary files /dev/null and b/services/static-webserver/client/source/resource/iconfont/fontawesome7/webfonts/fa-brands-400.woff2 differ diff --git a/services/static-webserver/client/source/resource/iconfont/fontawesome7/webfonts/fa-regular-400.woff2 b/services/static-webserver/client/source/resource/iconfont/fontawesome7/webfonts/fa-regular-400.woff2 new file mode 100644 index 000000000000..2eca12b0e7b5 Binary files /dev/null and b/services/static-webserver/client/source/resource/iconfont/fontawesome7/webfonts/fa-regular-400.woff2 differ diff --git a/services/static-webserver/client/source/resource/iconfont/fontawesome7/webfonts/fa-solid-900.woff2 b/services/static-webserver/client/source/resource/iconfont/fontawesome7/webfonts/fa-solid-900.woff2 new file mode 100644 index 000000000000..c20c7f4feb4e Binary files /dev/null and b/services/static-webserver/client/source/resource/iconfont/fontawesome7/webfonts/fa-solid-900.woff2 differ