Consistent styling of applications for a site and a project #3523

enonic · Apr 4, 2024 · be243b4 · be243b4
1 parent 4c2d7ec
commit be243b4
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 36 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -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
@@ -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
@@ -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/...ces/assets/admin/common/styles/api/form/inputtype/appconfig/application-configurator.less b/...ces/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
@@ -89,7 +89,7 @@
           color: @admin-button-blue1;
         }
 
-        margin-right: 12px;
+        margin-right: 5px;
         flex-basis: 24px;
         flex-grow: 0;
         flex-shrink: 0;