From be243b43eb97a04298965b2f45bf805a9e24da02 Mon Sep 17 00:00:00 2001 From: alansemenov Date: Thu, 4 Apr 2024 17:13:09 +0200 Subject: [PATCH] Consistent styling of applications for a site and a project #3523 --- package-lock.json | 14 +++++----- package.json | 2 +- .../assets/admin/common/icons/icons.less | 13 ---------- .../common/js/application/Application.ts | 4 +++ .../styles/api/app/names-and-icon-view.less | 1 + .../appconfig/application-configurator.less | 26 +++++++++---------- .../styles/api/ui/treegrid/tree-grid.less | 2 +- 7 files changed, 26 insertions(+), 36 deletions(-) diff --git a/package-lock.json b/package-lock.json index ed615ae77..c2481f1ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "copy-webpack-plugin": "^12.0.2", "css-loader": "^6.10.0", "cssnano": "^6.1.2", - "enonic-admin-artifacts": "^1.9.0", + "enonic-admin-artifacts": "^1.10.0", "error-logger-webpack-plugin": "^1.1.1", "eslint": "^8.57.0", "glob": "^10.3.12", @@ -2571,9 +2571,9 @@ } }, "node_modules/enonic-admin-artifacts": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/enonic-admin-artifacts/-/enonic-admin-artifacts-1.9.0.tgz", - "integrity": "sha512-3lIn64+p4RDNPF0DmI/gSYtHT/ANeKfGxdm3na1V9WYZgd8HIaOdNDtldMr8gWlEX12OL1Mgj68qZlXLKtRwzQ==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/enonic-admin-artifacts/-/enonic-admin-artifacts-1.10.0.tgz", + "integrity": "sha512-hb5FEphimFSPpsTwbNgbGc3Sr8g5egDBjQuQZVRs/A87Ja0rf5sklXeMNdKu5wdjDcW2yUei9af5VK4s0ga+0A==", "dev": true, "engines": { "node": ">= 20.9.0", @@ -9326,9 +9326,9 @@ } }, "enonic-admin-artifacts": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/enonic-admin-artifacts/-/enonic-admin-artifacts-1.9.0.tgz", - "integrity": "sha512-3lIn64+p4RDNPF0DmI/gSYtHT/ANeKfGxdm3na1V9WYZgd8HIaOdNDtldMr8gWlEX12OL1Mgj68qZlXLKtRwzQ==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/enonic-admin-artifacts/-/enonic-admin-artifacts-1.10.0.tgz", + "integrity": "sha512-hb5FEphimFSPpsTwbNgbGc3Sr8g5egDBjQuQZVRs/A87Ja0rf5sklXeMNdKu5wdjDcW2yUei9af5VK4s0ga+0A==", "dev": true }, "entities": { diff --git a/package.json b/package.json index 109ec330c..1979e8e0c 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "copy-webpack-plugin": "^12.0.2", "css-loader": "^6.10.0", "cssnano": "^6.1.2", - "enonic-admin-artifacts": "^1.9.0", + "enonic-admin-artifacts": "^1.10.0", "error-logger-webpack-plugin": "^1.1.1", "eslint": "^8.57.0", "glob": "^10.3.12", diff --git a/src/main/resources/assets/admin/common/icons/icons.less b/src/main/resources/assets/admin/common/icons/icons.less index 7b9d48c1b..35c1b439f 100644 --- a/src/main/resources/assets/admin/common/icons/icons.less +++ b/src/main/resources/assets/admin/common/icons/icons.less @@ -602,16 +602,3 @@ content: "\e9c9"; } } - -.icon-alert() { - &::before { - content: "!"; - display: block; - background-color: @admin-red; - color: @admin-white; - width: 16px; - height: 16px; - border-radius: 10px; - font-size: 14px; - } -} diff --git a/src/main/resources/assets/admin/common/js/application/Application.ts b/src/main/resources/assets/admin/common/js/application/Application.ts index fc43e8b07..39db570f3 100644 --- a/src/main/resources/assets/admin/common/js/application/Application.ts +++ b/src/main/resources/assets/admin/common/js/application/Application.ts @@ -136,6 +136,10 @@ export class Application return this.state === Application.STATE_STARTED; } + isStopped(): boolean { + return this.state === Application.STATE_STOPPED; + } + hasChildren(): boolean { return false; } diff --git a/src/main/resources/assets/admin/common/styles/api/app/names-and-icon-view.less b/src/main/resources/assets/admin/common/styles/api/app/names-and-icon-view.less index 5549d980e..61c5e9edc 100644 --- a/src/main/resources/assets/admin/common/styles/api/app/names-and-icon-view.less +++ b/src/main/resources/assets/admin/common/styles/api/app/names-and-icon-view.less @@ -29,6 +29,7 @@ .@{_COMMON_PREFIX}wrapper { display: flex; align-items: center; + justify-content: center; height: @size; width: @size; margin-right: @icon-names-gap; diff --git a/src/main/resources/assets/admin/common/styles/api/form/inputtype/appconfig/application-configurator.less b/src/main/resources/assets/admin/common/styles/api/form/inputtype/appconfig/application-configurator.less index 63a0692cd..116b5c3e2 100644 --- a/src/main/resources/assets/admin/common/styles/api/form/inputtype/appconfig/application-configurator.less +++ b/src/main/resources/assets/admin/common/styles/api/form/inputtype/appconfig/application-configurator.less @@ -20,16 +20,26 @@ &:not(.placeholder) { height: auto; - &.invalid, - &.uninstalled { + .@{_COMMON_PREFIX}wrapper { + margin-right: 10px; + } + + &.invalid { .highlight-option(@admin-input-red); margin-bottom: 5px; } + &.stopped, &.uninstalled { .@{_COMMON_PREFIX}wrapper { .icon-alert(); + &:before { + position: relative; + top: auto; + left: auto; + } + .font-icon-default { display: none; } @@ -39,14 +49,6 @@ display: none; } } - - &.stopped { - opacity: 0.5; - - a.edit { - display: none; - } - } } } @@ -66,7 +68,3 @@ } } } - -.wizard-panel .wizard-steps-panel .wizard-step-form .application-configurator .form-view { - margin: 10px 0 0 0; -} diff --git a/src/main/resources/assets/admin/common/styles/api/ui/treegrid/tree-grid.less b/src/main/resources/assets/admin/common/styles/api/ui/treegrid/tree-grid.less index 95c60338f..b6b284f4f 100644 --- a/src/main/resources/assets/admin/common/styles/api/ui/treegrid/tree-grid.less +++ b/src/main/resources/assets/admin/common/styles/api/ui/treegrid/tree-grid.less @@ -89,7 +89,7 @@ color: @admin-button-blue1; } - margin-right: 12px; + margin-right: 5px; flex-basis: 24px; flex-grow: 0; flex-shrink: 0;