Skip to content

Commit c9e326f

Browse files
fix(ui5-shellbar): Fix badge misplacement of the ShellBar (#13212)
Add Quartz theme parameters for badge offset and margin to keep correct placement in sap_fiori_3 variants, including HCB and HCW. Preserve default badge behavior in other themes with fallback values. Fixes: #12962
1 parent 3a56e61 commit c9e326f

6 files changed

Lines changed: 22 additions & 0 deletions

File tree

packages/fiori/src/themes/ShellBar.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,11 @@ of the search field container in the bar even when the search is in full mode. *
246246
box-sizing: border-box;
247247
}
248248

249+
.ui5-shellbar-action-button > [ui5-button-badge][slot="badge"][design="OverlayText"] {
250+
top: var(--_ui5-shellbar-badge-offset, 0);
251+
margin: var(--_ui5-shellbar-badge-margin, -0.5rem);
252+
}
253+
249254
.ui5-shellbar-image-button {
250255
display: flex;
251256
justify-content: center;

packages/fiori/src/themes/ShellBarItem.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
color: var(--_ui5_shellbar_button_active_color);
1717
}
1818

19+
.ui5-shellbar-action-button > [ui5-button-badge][slot="badge"][design="OverlayText"] {
20+
top: var(--_ui5-shellbar-badge-offset, 0);
21+
margin: var(--_ui5-shellbar-badge-margin, -0.5rem);
22+
}
23+
1924
[ui5-li]:after {
2025
position: relative;
2126
width: fit-content;

packages/fiori/src/themes/sap_fiori_3/ShellBar-parameters.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22

33
:host {
44
--_ui5_shellbar_button_focused_border: 0.0625rem dotted var(--sapContent_ContrastFocusColor);
5+
/* Badge position adjustment for shorter shellbar height in Quartz theme */
6+
--_ui5-shellbar-badge-offset: 0.25rem;
7+
--_ui5-shellbar-badge-margin: -0.25rem;
58
}

packages/fiori/src/themes/sap_fiori_3_dark/ShellBar-parameters.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22

33
:host {
44
--_ui5_shellbar_logo_outline_color: var(--sapContent_FocusColor);
5+
/* Badge position adjustment for shorter shellbar height in Quartz theme */
6+
--_ui5-shellbar-badge-offset: 0.25rem;
7+
--_ui5-shellbar-badge-margin: -0.25rem;
58
}

packages/fiori/src/themes/sap_fiori_3_hcb/ShellBar-parameters.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22

33
:host {
44
--_ui5_shellbar_button_focused_border: 0.125rem dotted var(--sapContent_FocusColor);
5+
/* Badge position adjustment for shorter shellbar height in Quartz theme */
6+
--_ui5-shellbar-badge-offset: 0.25rem;
7+
--_ui5-shellbar-badge-margin: -0.375rem;
58
}

packages/fiori/src/themes/sap_fiori_3_hcw/ShellBar-parameters.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22

33
:host {
44
--_ui5_shellbar_button_focused_border: 0.125rem dotted var(--sapContent_FocusColor);
5+
/* Badge position adjustment for shorter shellbar height in Quartz theme */
6+
--_ui5-shellbar-badge-offset: 0.25rem;
7+
--_ui5-shellbar-badge-margin: -0.375rem;
58
}

0 commit comments

Comments
 (0)