MID-8875 attempt to improve logo handling

Evolveum · Jun 14, 2023 · ccec0b7 · ccec0b7
1 parent c287bbc
commit ccec0b7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/gui/admin-gui/src/frontend/scss/midpoint.scss b/gui/admin-gui/src/frontend/scss/midpoint.scss
@@ -57,6 +57,8 @@ body.custom-hold-transition {
   }
 
   & > a.custom-logo {
+    height: 3.5rem;
+    max-height: 3.5rem;
 
     & > img {
       vertical-align: middle;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java
@@ -209,7 +209,10 @@ public void onClick(AjaxRequestTarget target) {
             }
         };
         customLogo.add(AttributeAppender.append("class", () -> WebComponentUtil.getMidPointSkin().getNavbarCss()));
-        customLogo.add(AttributeAppender.append("class", () -> logoModel.getObject().getCssClass()));
+        customLogo.add(AttributeAppender.append("class", () -> {
+            IconType icon = logoModel.getObject();
+            return StringUtils.isNotEmpty(icon.getImageUrl()) ? logoModel.getObject().getCssClass() : null;
+        }));
         customLogo.add(new VisibleBehaviour(() -> isCustomLogoVisible()));
         add(customLogo);