Skip to content

fix(Toolbar): always align items in the center #1847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Lukas742 merged 3 commits into from
Jul 21, 2021
Merged

fix(Toolbar): always align items in the center #1847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e618e6
fix(Toolbar): always align items in the center
Lukas742 Jul 20, 2021
4cd2886
update snapshots
Lukas742 Jul 20, 2021
4ed88f6
Merge branch 'main' into fix/toolbar-alignment
Lukas742 Jul 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
164 changes: 132 additions & 32 deletions packages/main/src/components/DynamicPage/__snapshots__/DynamicPage.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,71 +159,99 @@ exports[`DynamicPage always show content header 1`] = `
>
<div
class="Toolbar-toolbar"
data-component-name="ToolbarContent"
>
<span
class="spacer"
style="flex-grow: 1; height: 100%; cursor: pointer;"
/>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Emphasized"
ui5-button=""
>
Edit
</ui5-button>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
ui5-button=""
>
Delete
</ui5-button>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
ui5-button=""
>
Copy
</ui5-button>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
ui5-button=""
>
Toggle Footer
</ui5-button>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
icon="action"
ui5-button=""
/>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<div
aria-label="Separator"
class="ToolbarSeparator-separator"
/>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
icon="full-screen"
ui5-button=""
/>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
icon="exit-full-screen"
ui5-button=""
/>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
icon="decline"
Expand Down Expand Up @@ -356,44 +384,60 @@ exports[`DynamicPage hider header button 1`] = `
>
<div
class="Toolbar-toolbar"
data-component-name="ToolbarContent"
>
<span
class="spacer"
style="flex-grow: 1; height: 100%; cursor: pointer;"
/>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Emphasized"
ui5-button=""
>
Edit
</ui5-button>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
ui5-button=""
>
Delete
</ui5-button>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
ui5-button=""
>
Copy
</ui5-button>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
ui5-button=""
>
Toggle Footer
</ui5-button>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
icon="action"
Expand Down Expand Up @@ -856,71 +900,99 @@ exports[`DynamicPage with content 1`] = `
>
<div
class="Toolbar-toolbar"
data-component-name="ToolbarContent"
>
<span
class="spacer"
style="flex-grow: 1; height: 100%; cursor: pointer;"
/>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Emphasized"
ui5-button=""
>
Edit
</ui5-button>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
ui5-button=""
>
Delete
</ui5-button>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
ui5-button=""
>
Copy
</ui5-button>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
ui5-button=""
>
Toggle Footer
</ui5-button>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
icon="action"
ui5-button=""
/>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<div
aria-label="Separator"
class="ToolbarSeparator-separator"
/>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
icon="full-screen"
ui5-button=""
/>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
icon="exit-full-screen"
ui5-button=""
/>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
icon="decline"
Expand Down Expand Up @@ -1833,71 +1905,99 @@ exports[`DynamicPage without content 1`] = `
>
<div
class="Toolbar-toolbar"
data-component-name="ToolbarContent"
>
<span
class="spacer"
style="flex-grow: 1; height: 100%; cursor: pointer;"
/>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Emphasized"
ui5-button=""
>
Edit
</ui5-button>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
ui5-button=""
>
Delete
</ui5-button>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
ui5-button=""
>
Copy
</ui5-button>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
ui5-button=""
>
Toggle Footer
</ui5-button>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
icon="action"
ui5-button=""
/>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<div
aria-label="Separator"
class="ToolbarSeparator-separator"
/>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
icon="full-screen"
ui5-button=""
/>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
icon="exit-full-screen"
ui5-button=""
/>
</div>
<div>
<div
class="Toolbar-childContainer"
data-component-name="ToolbarChildContainer"
>
<ui5-button
design="Transparent"
icon="decline"
Expand Down
Loading