Skip to content

Commit 3841ba2

Browse files
Merge branch 'main' into main
2 parents d307183 + 45f7158 commit 3841ba2

6 files changed

Lines changed: 57 additions & 10 deletions

File tree

README.md

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,23 @@ Since version `1.11.0`, we have been providing TypeScript definitions under an e
9696
No, you are expected to import only the components (or other public APIs) that you are going to use and bundle them along with the rest
9797
of your application.
9898

99-
## Browser Support
99+
## Browser and Platform Support
100100

101-
UI5 Web Components are supported by all major modern browsers.
101+
UI5 Web Components are supported by all major modern browsers on the desktop and mobile platforms listed below.
102102

103-
Browser | Supported versions
104-
--------|--------
105-
Chrome | Latest two stable releases
106-
Firefox | Latest two stable releases
107-
Safari | Latest two stable releases
108-
Edge | Latest two stable releases
103+
### Desktop
104+
105+
| | Google Chrome | Microsoft Edge | Mozilla Firefox | Mozilla Firefox ESR | Apple Safari |
106+
| ------------------------------ | --------------- | --------------- | --------------- | ------------------- | --------------- |
107+
| **Windows** (versions 10 & 11) | Latest 2 Stable | Latest 2 Stable | Latest 2 Stable | Latest | n/a |
108+
| **macOS** (Latest 2 versions) | Latest 2 Stable | Latest 2 Stable | Latest 2 Stable | Latest | Latest 2 Stable |
109+
110+
### Mobile
111+
112+
| | Google Chrome | Apple Safari |
113+
| --------------------------------- | --------------- | --------------- |
114+
| **Android** (Latest 3 versions) | Latest 2 Stable | n/a |
115+
| **iOS & iPadOS** (Latest version) | - | Latest 2 Stable |
109116

110117
## Project Structure, Development and Build
111118

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
sidebar_label: Browser and Platform Support
3+
title: Browser and Platform Support
4+
---
5+
6+
# Browser and Platform Support
7+
8+
UI5 Web Components are supported by all major modern browsers on the desktop and mobile platforms listed below.
9+
10+
## Desktop
11+
12+
| | Google Chrome | Microsoft Edge | Mozilla Firefox | Mozilla Firefox ESR | Apple Safari |
13+
| ------------------------------ | --------------- | --------------- | --------------- | ------------------- | --------------- |
14+
| **Windows** (versions 10 & 11) | Latest 2 Stable | Latest 2 Stable | Latest 2 Stable | Latest | n/a |
15+
| **macOS** (Latest 2 versions) | Latest 2 Stable | Latest 2 Stable | Latest 2 Stable | Latest | Latest 2 Stable |
16+
17+
## Mobile
18+
19+
| | Google Chrome | Apple Safari |
20+
| --------------------------------- | --------------- | --------------- |
21+
| **Android** (Latest 3 versions) | Latest 2 Stable | n/a |
22+
| **iOS & iPadOS** (Latest version) | - | Latest 2 Stable |
File renamed without changes.

packages/fiori/cypress/specs/ShellBar.cy.tsx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1846,4 +1846,17 @@ describe("Component Behavior", () => {
18461846
expect(cursor).to.equal("pointer");
18471847
});
18481848
});
1849+
});
1850+
1851+
describe("Start button spacing", () => {
1852+
it("8px gap between multiple startButton elements", () => {
1853+
cy.mount(
1854+
<ShellBar>
1855+
<Button id="hamburger-btn" icon="menu2" slot="startButton"></Button>
1856+
<Button id="nav-back-btn" icon={navBack} slot="startButton"></Button>
1857+
</ShellBar>
1858+
);
1859+
1860+
cy.get("[ui5-shellbar]").shadow().find(".ui5-shellbar-start-button").should("have.css", "gap", "8px");
1861+
});
18491862
});

packages/fiori/src/themes/ShellBar.css

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@
9999
}
100100

101101
.ui5-shellbar-action-button:hover {
102-
color: var(--sapShell_TextColor);
102+
background: var(--sapShell_Hover_Background);
103+
border-color: var(--sapButton_Lite_Hover_BorderColor);
104+
color: var(--sapShell_InteractiveTextColor);
103105
}
104106

105107
.ui5-shellbar-action-button[active] {
@@ -126,6 +128,7 @@
126128
flex-shrink: 0;
127129
display: flex;
128130
align-items: center;
131+
gap: 0.5rem;
129132
}
130133

131134
.ui5-shellbar-branding-area {

packages/fiori/src/themes/ShellBarItem.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
}
1010

1111
.ui5-shellbar-action-button:hover {
12-
color: var(--sapShell_TextColor);
12+
background: var(--sapShell_Hover_Background);
13+
border-color: var(--sapButton_Lite_Hover_BorderColor);
14+
color: var(--sapShell_InteractiveTextColor);
1315
}
1416

1517
.ui5-shellbar-action-button[active] {

0 commit comments

Comments
 (0)