Skip to content

Commit b5b1dae

Browse files
committed
fix: remove 320px fix
1 parent 3c5db61 commit b5b1dae

File tree

5 files changed

+7
-28
lines changed

5 files changed

+7
-28
lines changed

packages/fiori/src/ShellBar.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1446,23 +1446,14 @@ class ShellBar extends UI5Element {
14461446
}
14471447

14481448
get showStartSeparator(): boolean {
1449-
if (this.isSBreakPoint) {
1450-
return false;
1451-
}
14521449
return this.startContentInfoSorted.some(item => !item.classes.includes("ui5-shellbar-hidden-button"));
14531450
}
14541451

14551452
get showEndSeparator(): boolean {
1456-
if (this.isSBreakPoint) {
1457-
return false;
1458-
}
14591453
return this.endContentInfoSorted.some(item => !item.classes.includes("ui5-shellbar-hidden-button"));
14601454
}
14611455

14621456
shouldIncludeSeparator(itemInfo: IShellBarContentItem | undefined, contentInfo: IShellBarContentItem[]) {
1463-
if (this.isSBreakPoint) {
1464-
return false;
1465-
}
14661457
// once the last item from the start/end content was hidden, the
14671458
// separator is "packed" with it in order to account for any next measurements
14681459
if (!itemInfo) {

packages/fiori/src/ShellBarV2.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -895,10 +895,6 @@ class ShellBarV2 extends UI5Element {
895895
}
896896

897897
get separatorConfig() {
898-
if (this.isSBreakPoint) {
899-
return { showStartSeparator: false, showEndSeparator: false };
900-
}
901-
902898
const { start, end } = this.splitContent(this.content);
903899

904900
return {

packages/fiori/src/themes/NavigationLayout.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,5 @@
6161

6262
:host([has-side-navigation]) ::slotted([ui5-shellbar][slot="header"]),
6363
:host([has-side-navigation]) ::slotted([ui5-shellbar-v2][slot="header"]) {
64-
padding-inline: 0.875rem;
64+
padding-inline: 0.875rem 1rem;
6565
}

packages/fiori/src/themes/ShellBar.css

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -300,18 +300,14 @@ slot[name="profile"] {
300300
border-radius: var(--_ui5_shellbar_image_button_border_radius);
301301
}
302302

303-
:host([breakpoint-size="S"]) .ui5-shellbar-image-button {
304-
margin-inline-start: 6px;
305-
}
306-
307303
.ui5-shellbar-overflow-container-left {
308304
padding: 0;
309305
justify-content: flex-start;
310306
max-width: 75%;
311307
flex-shrink: 0;
312308
}
313309

314-
.ui5-shellbar-overflow-container-left > :nth-child(n):not(.ui5-shellbar-logo) {
310+
.ui5-shellbar-overflow-container-left > :nth-child(n) {
315311
margin-inline-end: 0.5rem;
316312
}
317313

packages/fiori/src/themes/ShellBarBranding.css

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,16 @@
1010
overflow: hidden;
1111
display: flex;
1212
align-items: center;
13+
padding-block: 0.25rem;
14+
padding-inline: 0.25rem 0.5rem;
1315
box-sizing: border-box;
1416
cursor: pointer;
1517
background: var(--sapButton_Lite_Background);
1618
border: 1px solid var(--sapButton_Lite_BorderColor);
1719
color: var(--sapShell_TextColor);
18-
}
19-
20-
:host(:not([_is-sbreak-point])) .ui5-shellbar-branding-root {
21-
padding-block: 0.25rem;
22-
padding-inline: 0.25rem 0.5rem;
23-
margin-inline-end: .25rem;
20+
/* fix cutting of the focus outline */
21+
margin-inline-start: 0.125rem;
22+
margin-inline-end: .5rem;
2423
}
2524

2625
.ui5-shellbar-branding-root:focus {
@@ -68,9 +67,6 @@
6867

6968
::slotted([slot="logo"]) {
7069
max-height: 2rem;
71-
}
72-
73-
:host(:not([_is-sbreak-point])) ::slotted([slot="logo"]) {
7470
padding-inline: 0.25rem;
7571
}
7672

0 commit comments

Comments
 (0)