diff --git a/addons/core/public/logo-app-full.svg b/addons/core/public/logo-app-full.svg new file mode 100644 index 000000000..2d64e2942 --- /dev/null +++ b/addons/core/public/logo-app-full.svg @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/core/public/logo-company.svg b/addons/core/public/logo-company.svg index 0f07cf263..92ce7776e 100644 --- a/addons/core/public/logo-company.svg +++ b/addons/core/public/logo-company.svg @@ -5,7 +5,7 @@ fill="none" xmlns="http://www.w3.org/2000/svg"> - + diff --git a/addons/rose/addon/styles/rose/components/dialog/_cover.scss b/addons/rose/addon/styles/rose/components/dialog/_cover.scss index 7652dc3b2..c41fed32b 100644 --- a/addons/rose/addon/styles/rose/components/dialog/_cover.scss +++ b/addons/rose/addon/styles/rose/components/dialog/_cover.scss @@ -2,6 +2,7 @@ position: fixed; top: 0; left: 0; + z-index: 200; width: 100vw; height: 100vh; display: flex; @@ -33,5 +34,6 @@ top: 0; bottom: 0; right: 0; + z-index: 100; opacity: 0.85; } diff --git a/ui/admin/app/styles/app.scss b/ui/admin/app/styles/app.scss index b41ac52d3..4647973af 100644 --- a/ui/admin/app/styles/app.scss +++ b/ui/admin/app/styles/app.scss @@ -138,6 +138,20 @@ } } +.rose-frame { + .rose-form-actions { + .rose-button-primary { + display: block; + margin: 0; + width: 100%; + + .rose-button-wrapper { + display: inline; + } + } + } +} + .copyable { white-space: nowrap; diff --git a/ui/admin/public/logo-app-full.svg b/ui/admin/public/logo-app-full.svg deleted file mode 100644 index fd38d1aa7..000000000 --- a/ui/admin/public/logo-app-full.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/desktop/electron-app/src/app-updater.js b/ui/desktop/electron-app/src/app-updater.js index b758a6eac..a4982834d 100644 --- a/ui/desktop/electron-app/src/app-updater.js +++ b/ui/desktop/electron-app/src/app-updater.js @@ -90,7 +90,7 @@ const downloadAndInstallUpdate = async (version) => { * TODO: download progress in dialog **/ module.exports = { - run: async ({ suppressNoUpdatePrompt }) => { + run: async ({ suppressNoUpdatePrompt } = {}) => { let latestVersion; if (debug) { latestVersion = process.env.APP_UPDATER_LATEST_VERSION_TAG; @@ -104,7 +104,8 @@ module.exports = { } // Update not available - do nothing - if (!suppressNoUpdatePrompt && semver.lte(latestVersion, currentVersion)) { + if (semver.lte(latestVersion, currentVersion)) { + if (suppressNoUpdatePrompt) return; const dialogOpts = { type: 'info', icon: null, @@ -112,21 +113,20 @@ module.exports = { }; dialog.showMessageBox(dialogOpts); - return; + } else { + // Update is available - prompt for download + const dialogOpts = { + type: 'info', + buttons: ['Download', 'Later'], + icon: null, + detail: 'A new version is available for download', + }; + + dialog.showMessageBox(dialogOpts).then((returnValue) => { + if (returnValue.response === 0) { + downloadAndInstallUpdate(latestVersion); + } + }); } - - // Update is available - prompt for download - const dialogOpts = { - type: 'info', - buttons: ['Download', 'Later'], - icon: null, - detail: 'A new version is available for download', - }; - - dialog.showMessageBox(dialogOpts).then((returnValue) => { - if (returnValue.response === 0) { - downloadAndInstallUpdate(latestVersion); - } - }); }, }; diff --git a/ui/desktop/public/logo-app-full.svg b/ui/desktop/public/logo-app-full.svg deleted file mode 100644 index fd38d1aa7..000000000 --- a/ui/desktop/public/logo-app-full.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file