From b6ac9f4c4ce0a1bb89eb7b127484dc95a0e47864 Mon Sep 17 00:00:00 2001
From: Stoyan <abvsuxhard@gmail.com>
Date: Mon, 1 Jun 2026 15:09:09 +0300
Subject: [PATCH 1/2] fix(ui5-bar, ui5-button): prevent button badge from being
 clipped inside the bar

---
 packages/main/src/themes/Bar.css    | 16 ++++++++++++----
 packages/main/src/themes/Button.css |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/main/src/themes/Bar.css b/packages/main/src/themes/Bar.css
index 386a40cedf5b..cbc30f284ece 100644
--- a/packages/main/src/themes/Bar.css
+++ b/packages/main/src/themes/Bar.css
@@ -16,7 +16,8 @@
 	box-shadow: inherit;
 	border-radius: inherit;
 	min-width: 0;
-	overflow: hidden;
+	overflow-x: clip;
+	overflow-y: visible;
 }
 
 .ui5-bar-root .ui5-bar-startcontent-container,
@@ -39,7 +40,8 @@
 	flex: 1 1 auto;
 	padding: 0 var(--_ui5_bar-mid-container-padding-start-end);
 	min-width: 0;
-	overflow: hidden;
+	overflow-x: clip;
+	overflow-y: visible;
 }
 
 .ui5-bar-root .ui5-bar-startcontent-container {
@@ -54,7 +56,8 @@
 
 .ui5-bar-root.ui5-bar-root-shrinked .ui5-bar-content-container {
 	min-width: 0px;
-	overflow: hidden;
+	overflow-x: clip;
+	overflow-y: visible;
 	height: 100%;
 }
 
@@ -80,7 +83,7 @@
 	border: none;
 }
 
-::slotted(*:not([hidden])) {
+::slotted(*:not([hidden]):not([ui5-button])) {
 	margin: 0 0.25rem;
 	display: inline-block;
     max-width: 100%;
@@ -88,4 +91,9 @@
     overflow: hidden;
     text-overflow: ellipsis;
     box-sizing: border-box;
+}
+
+::slotted([ui5-button]) {
+	margin: 0 0.25rem;
+	--_ui5_button_overlay_badge_offset: -0.25rem;
 }
\ No newline at end of file
diff --git a/packages/main/src/themes/Button.css b/packages/main/src/themes/Button.css
index f6873fe4792c..e33928c4ff5a 100644
--- a/packages/main/src/themes/Button.css
+++ b/packages/main/src/themes/Button.css
@@ -318,7 +318,7 @@ bdi {
 	position: absolute;
 	top: 0;
 	inset-inline-end: 0;
-	margin: -0.5rem;
+	margin: var(--_ui5_button_overlay_badge_offset, -0.5rem);
 	z-index: 1;
 	font-family: var(--sapButton_FontFamily);
 	font-size: var(--sapFontSmallSize);

From 2e1a513f45f191795894709c8d0a38fd4a32210a Mon Sep 17 00:00:00 2001
From: Stoyan <stoyan.kralimarkov@sap.com>
Date: Mon, 8 Jun 2026 16:46:24 +0300
Subject: [PATCH 2/2] make variable only in Cozy

---
 packages/main/src/themes/Bar.css | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/main/src/themes/Bar.css b/packages/main/src/themes/Bar.css
index cbc30f284ece..f477e15fc4ee 100644
--- a/packages/main/src/themes/Bar.css
+++ b/packages/main/src/themes/Bar.css
@@ -93,7 +93,14 @@
     box-sizing: border-box;
 }
 
+/* Scoped here (not in Bar-parameters.css) so the override applies only to buttons inside a Bar, not to standalone buttons on the page. */
 ::slotted([ui5-button]) {
 	margin: 0 0.25rem;
 	--_ui5_button_overlay_badge_offset: -0.25rem;
+}
+
+@container style(--ui5_content_density: compact) {
+	::slotted([ui5-button]) {
+		--_ui5_button_overlay_badge_offset: initial;
+	}
 }
\ No newline at end of file