From 0efe87b76139fb696634ad5d3cea85a5f68a7aa1 Mon Sep 17 00:00:00 2001
From: Filip Siderov <filip.siderov@sap.com>
Date: Thu, 30 Dec 2021 14:31:29 +0200
Subject: [PATCH 1/2] fix(ui5-card-header): fix rtl support

---
 packages/main/src/CardHeader.hbs        | 12 +++++++-----
 packages/main/src/themes/CardHeader.css | 10 +++++++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/main/src/CardHeader.hbs b/packages/main/src/CardHeader.hbs
index 34b0520fb960..74bff70ad380 100644
--- a/packages/main/src/CardHeader.hbs
+++ b/packages/main/src/CardHeader.hbs
@@ -27,9 +27,11 @@
 		{{/if}}
 	</div>
 
-	{{#if hasAction}}
-		<slot name="action"></slot>
-	{{else}}
-		<span id="{{_id}}-status" part="status" class="ui5-card-header-status" dir="auto">{{status}}</span>
-	{{/if}}
+	<div class="ui5-card-header-action">
+		{{#if hasAction}}
+			<slot name="action"></slot>
+		{{else}}
+			<span id="{{_id}}-status" part="status" class="ui5-card-header-status">{{status}}</span>
+		{{/if}}
+	</div>
 </div>
\ No newline at end of file
diff --git a/packages/main/src/themes/CardHeader.css b/packages/main/src/themes/CardHeader.css
index 2e67f21b8cda..3fb21ea70b91 100644
--- a/packages/main/src/themes/CardHeader.css
+++ b/packages/main/src/themes/CardHeader.css
@@ -72,7 +72,6 @@
 	color: var(--sapTile_TextColor);
 	text-align: left;
 	line-height: 1.125rem;
-	padding-left: 1rem;
 	margin-left: auto;
 	text-overflow: ellipsis;
 	overflow: hidden;
@@ -109,15 +108,20 @@
 	max-width: 100%;
 }
 
+
+.ui5-card-header-action {
+	display: flex;
+	padding-left: 1rem;
+}
+
 [dir="rtl"].ui5-card-header .ui5-card-header-avatar {
 	margin-left: .75rem;
 	margin-right: 0;
 }
 
-[dir="rtl"].ui5-card-header .ui5-card-header-status {
+[dir="rtl"].ui5-card-header .ui5-card-header-action {
 	padding-right: 1rem;
 	padding-left: 0rem;
-	margin-right: auto;
 }
 
 [dir="rtl"].ui5-card-header .ui5-card-header-text .ui5-card-header-title {

From f15918bb8a150dec664e9e96678cf65ee56aba11 Mon Sep 17 00:00:00 2001
From: Filip Siderov <filip.siderov@sap.com>
Date: Fri, 31 Dec 2021 10:14:43 +0200
Subject: [PATCH 2/2] fix comments

---
 packages/main/src/CardHeader.hbs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/main/src/CardHeader.hbs b/packages/main/src/CardHeader.hbs
index 74bff70ad380..e67f53455ebf 100644
--- a/packages/main/src/CardHeader.hbs
+++ b/packages/main/src/CardHeader.hbs
@@ -31,7 +31,12 @@
 		{{#if hasAction}}
 			<slot name="action"></slot>
 		{{else}}
-			<span id="{{_id}}-status" part="status" class="ui5-card-header-status">{{status}}</span>
+			<span
+				id="{{_id}}-status"
+				part="status"
+				class="ui5-card-header-status"
+				dir="auto"	
+			>{{status}}</span>
 		{{/if}}
 	</div>
 </div>
\ No newline at end of file