Skip to content
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

Jump to bottom

[FW][FIX] menu: non-aligned menu items #3906

Closed
wants to merge 1 commit into from
Closed

[FW][FIX] menu: non-aligned menu items #3906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/menu/menu.xml
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
t-att-class="{ 'o-menu-root': isMenuRoot, 'disabled': !isMenuEnabled, 'o-menu-item-active': isParentMenu(subMenu, menuItem)}"
t-att-style="getColor(menuItem)">
<div class="d-flex w-100">
<div t-if="childrenHaveIcon" class="o-menu-item-icon align-middle">
<div t-if="childrenHaveIcon" class="o-menu-item-icon align-middle flex-shrink-0">
<t t-if="getIconName(menuItem)" t-call="{{getIconName(menuItem)}}"/>
</div>
<div class="o-menu-item-name align-middle text-truncate" t-esc="getName(menuItem)"/>
Expand Down
24 changes: 12 additions & 12 deletions tests/__snapshots__/top_bar_component.test.ts.snap
View file
Open in desktop
Expand Up @@ -612,7 +612,7 @@ exports[`TopBar component can set cell format 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
>
<svg
class="o-icon"
Expand Down Expand Up @@ -646,7 +646,7 @@ exports[`TopBar component can set cell format 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
/>

<div
Expand All @@ -673,7 +673,7 @@ exports[`TopBar component can set cell format 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
/>

<div
Expand Down Expand Up @@ -701,7 +701,7 @@ exports[`TopBar component can set cell format 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
/>

<div
Expand Down Expand Up @@ -733,7 +733,7 @@ exports[`TopBar component can set cell format 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
/>

<div
Expand Down Expand Up @@ -761,7 +761,7 @@ exports[`TopBar component can set cell format 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
/>

<div
Expand Down Expand Up @@ -789,7 +789,7 @@ exports[`TopBar component can set cell format 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
/>

<div
Expand All @@ -816,7 +816,7 @@ exports[`TopBar component can set cell format 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
/>

<div
Expand Down Expand Up @@ -844,7 +844,7 @@ exports[`TopBar component can set cell format 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
/>

<div
Expand Down Expand Up @@ -872,7 +872,7 @@ exports[`TopBar component can set cell format 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
/>

<div
Expand Down Expand Up @@ -900,7 +900,7 @@ exports[`TopBar component can set cell format 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
/>

<div
Expand Down Expand Up @@ -932,7 +932,7 @@ exports[`TopBar component can set cell format 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
/>

<div
Expand Down
22 changes: 11 additions & 11 deletions tests/menus/__snapshots__/context_menu_component.test.ts.snap
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ exports[`Context Menu integration tests context menu simple rendering 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
>
<svg
class="o-icon"
Expand Down Expand Up @@ -52,7 +52,7 @@ exports[`Context Menu integration tests context menu simple rendering 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
>
<svg
class="o-icon"
Expand Down Expand Up @@ -90,7 +90,7 @@ exports[`Context Menu integration tests context menu simple rendering 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
>
<svg
class="o-icon"
Expand Down Expand Up @@ -128,7 +128,7 @@ exports[`Context Menu integration tests context menu simple rendering 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
>
<svg
class="o-icon"
Expand Down Expand Up @@ -185,7 +185,7 @@ exports[`Context Menu integration tests context menu simple rendering 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
>
<svg
class="o-icon"
Expand Down Expand Up @@ -218,7 +218,7 @@ exports[`Context Menu integration tests context menu simple rendering 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
>
<svg
class="o-icon"
Expand Down Expand Up @@ -251,7 +251,7 @@ exports[`Context Menu integration tests context menu simple rendering 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
>
<svg
class="o-icon"
Expand Down Expand Up @@ -308,7 +308,7 @@ exports[`Context Menu integration tests context menu simple rendering 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
>
<svg
class="o-icon"
Expand Down Expand Up @@ -341,7 +341,7 @@ exports[`Context Menu integration tests context menu simple rendering 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
>
<svg
class="o-icon"
Expand Down Expand Up @@ -374,7 +374,7 @@ exports[`Context Menu integration tests context menu simple rendering 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
>
<svg
class="o-icon"
Expand Down Expand Up @@ -431,7 +431,7 @@ exports[`Context Menu integration tests context menu simple rendering 1`] = `
class="d-flex w-100"
>
<div
class="o-menu-item-icon align-middle"
class="o-menu-item-icon align-middle flex-shrink-0"
>
<svg
class="o-icon"
Expand Down