From cee3b29d89b6c632259e70b56395f203f64e4018 Mon Sep 17 00:00:00 2001
From: Nikola Anachkov <nikola.anachkov@sap.com>
Date: Fri, 8 Nov 2024 16:05:34 +0200
Subject: [PATCH] fix(ui5-dynamic-page): move subheading slot outside title
 wrapper for layout consistency

---
 packages/fiori/src/DynamicPageTitle.hbs                        | 3 +--
 packages/fiori/test/pages/styles/DynamicPage.css               | 1 +
 .../website/docs/_samples/fiori/DynamicPage/Basic/main.css     | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/fiori/src/DynamicPageTitle.hbs b/packages/fiori/src/DynamicPageTitle.hbs
index 1eb5cb334f2a..7ff15ce277ea 100644
--- a/packages/fiori/src/DynamicPageTitle.hbs
+++ b/packages/fiori/src/DynamicPageTitle.hbs
@@ -28,7 +28,6 @@
       @ui5-_min-content-width-change={{onMinContentWidthChange}}>
       <div id="{{_id}}-heading" class="ui5-dynamic-page-title--heading">
         <slot name="{{headingSlotName}}"></slot>
-        <slot name="{{subheadingSlotName}}"></slot>
       </div>
 
       {{#if hasContent}}
@@ -49,7 +48,7 @@
         {{/unless}}
       </div>
     </div>
-
+    <slot name="{{subheadingSlotName}}"></slot>
   {{/if}}
   
   <span id="{{_id}}-toggle-description" class="ui5-hidden-text">{{_ariaDescribedbyText}}</span>
diff --git a/packages/fiori/test/pages/styles/DynamicPage.css b/packages/fiori/test/pages/styles/DynamicPage.css
index d10e82a72307..c750fd254ed5 100644
--- a/packages/fiori/test/pages/styles/DynamicPage.css
+++ b/packages/fiori/test/pages/styles/DynamicPage.css
@@ -63,6 +63,7 @@ html, body {
 }
 .snapped-title-heading [ui5-avatar] {
     position: absolute;
+    top: 0;
 }
 .snapped-title-heading [ui5-title] {
     font-family: var(--sapObjectHeader_Title_FontFamily);
diff --git a/packages/website/docs/_samples/fiori/DynamicPage/Basic/main.css b/packages/website/docs/_samples/fiori/DynamicPage/Basic/main.css
index a69b41156bab..889ecc1fa56c 100644
--- a/packages/website/docs/_samples/fiori/DynamicPage/Basic/main.css
+++ b/packages/website/docs/_samples/fiori/DynamicPage/Basic/main.css
@@ -61,6 +61,7 @@
 }
 .snapped-title-heading [ui5-avatar] {
     position: absolute;
+    top: 0;
 }
 .snapped-title-heading [ui5-title] {
     font-family: var(--sapObjectHeader_Title_FontFamily);