Merge branch 'main' into 8515-datagrid-dropdown

infor-design · Apr 8, 2024 · 0d66416 · 0d66416
2 parents 37a1821 + 41972ed
commit 0d66416
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -9,6 +9,7 @@
 
 ## v4.95.0 Fixes
 
+- `[Contextual Action Panel]` Fixed added padding on contextual action panel. ([#8553](https://github.com/infor-design/enterprise/issues/8553))
 - `[Datagrid]` Fixed search icon misalignment in dropwdown cells. ([#8515](https://github.com/infor-design/enterprise/issues/8515))
 - `[Forms]` Fixed fileupload layout in compact form. ([#8537](https://github.com/infor-design/enterprise/issues/8537))
 
@@ -25,6 +26,7 @@
 ## v4.94.0 Fixes
 
 - `[Avatar]` Is no longer round by default. To use it in module nav add the new `square` class. ([#8539](https://github.com/infor-design/enterprise/issues/8539))
+- `[Hierarchy]` Fix broken size on avatars on hierarchy. ([#8584](https://github.com/infor-design/enterprise/issues/8584))
 - `[Bar]` Fixed axis label visibility by adding font-size in `axis-labels` container. ([#8431](https://github.com/infor-design/enterprise/issues/8431))
 - `[Button]` Added start and stop methods for generative timeout. ([#8541](https://github.com/infor-design/enterprise/issues/8541))
 - `[Calendar]` Fixed event icon not properly rendered across week view mode. ([#8456](https://github.com/infor-design/enterprise/issues/8456))

diff --git a/src/components/contextualactionpanel/contextualactionpanel.js b/src/components/contextualactionpanel/contextualactionpanel.js
@@ -255,7 +255,7 @@ ContextualActionPanel.prototype = {
       }
 
       if (!isIframe) {
-        children.wrapAll('<div class="modal-content"></div>').wrapAll(`<div class="modal-body ${this.settings.detailRefId !== null ? 'padding-x-16 has-back-button' : ''}"></div>`);
+        children.wrapAll('<div class="modal-content"></div>').wrapAll(`<div class="modal-body ${this.settings.detailRefId !== undefined ? 'padding-x-16 has-back-button' : ''}"></div>`);
         this.panel.addClass('modal');
       }
     }

diff --git a/src/components/hierarchy/_hierarchy-base.scss b/src/components/hierarchy/_hierarchy-base.scss
@@ -37,7 +37,7 @@
     display: table;
     margin: 0 auto;
 
-    @media (max-width: $breakpoint-slim - 1px) {
+    @media (max-width: ($breakpoint-slim - 1px)) {
       width: 100%;
     }
 
@@ -132,6 +132,10 @@
     &.azure08 {
       border-left-color: $ids-color-palette-azure-80;
 
+      .image-initials {
+        background-color: $ids-color-palette-azure-80;
+      }
+
       .image-placeholder {
         border: 2px solid $ids-color-palette-azure-80;
       }
@@ -140,6 +144,10 @@
     &.turquoise02 {
       border-left-color: $ids-color-palette-turquoise-20;
 
+      .image-initials {
+        background-color: $ids-color-palette-turquoise-20;
+      }
+
       .image-placeholder {
         border: 2px solid $ids-color-palette-turquoise-20;
       }
@@ -148,6 +156,10 @@
     &.amethyst06 {
       border-left-color: $ids-color-palette-amethyst-60;
 
+      .image-initials {
+        background-color: $ids-color-palette-amethyst-60;
+      }
+
       .image-placeholder {
         border: 2px solid $ids-color-palette-amethyst-60;
       }
@@ -156,6 +168,10 @@
     &.slate06 {
       border-left-color: $ids-color-palette-slate-60;
 
+      .image-initials {
+        background-color: $ids-color-palette-slate-60;
+      }
+
       .image-placeholder {
         border: 2px solid $ids-color-palette-slate-60;
       }
@@ -164,6 +180,10 @@
     &.amber06 {
       border-left-color: $ids-color-palette-amber-60;
 
+      .image-initials {
+        background-color: $ids-color-palette-amber-60;
+      }
+
       .image-placeholder {
         border: 2px solid $ids-color-palette-amber-60;
       }
@@ -172,6 +192,10 @@
     &.emerald07 {
       border-left-color: $ids-color-palette-emerald-70;
 
+      .image-initials {
+        background-color: $ids-color-palette-emerald-70;
+      }
+
       .image-placeholder {
         border: 2px solid $ids-color-palette-emerald-70;
       }
@@ -180,6 +204,10 @@
     &.ruby06 {
       border-left-color: $ids-color-palette-ruby-60;
 
+      .image-initials {
+        background-color: $ids-color-palette-ruby-60;
+      }
+
       .image-placeholder {
         border: 2px solid $ids-color-palette-ruby-60;
       }
@@ -193,7 +221,6 @@
     img,
     .image-placeholder {
       border-radius: 50%;
-      display: inline-block;
       float: left;
       height: 55px;
       margin-left: 14px;
@@ -202,9 +229,9 @@
     }
 
     .image-initials {
-      display: inline-block;
       float: left;
       height: 55px;
+      min-height: 55px;
       line-height: 5.5rem;
       margin-left: 14px;
       margin-top: 10px;