diff --git a/src/lib/providers/prime-preset/tokens/components/menu.ts b/src/lib/providers/prime-preset/tokens/components/menu.ts index 7dbe6b88..36ecee32 100644 --- a/src/lib/providers/prime-preset/tokens/components/menu.ts +++ b/src/lib/providers/prime-preset/tokens/components/menu.ts @@ -5,9 +5,13 @@ export const menuCss = ({ dt }: { dt: (token: string) => string }): string => ` .p-menu .p-menu-item-content .p-menu-item-link .p-menu-item-label { font-family: ${dt('fonts.fontFamily.base')}; - font-size: ${dt('fonts.fontSize.300')}; + font-size: ${dt('fonts.fontSize.200')}; font-weight: ${dt('fonts.fontWeight.regular')}; - line-height: ${dt('fonts.lineHeight.400')}; + line-height: ${dt('fonts.lineHeight.none')}; + } + + .p-menu .p-menu-item-content .p-menu-item-icon { + font-size: ${dt('menu.extend.iconSize')}; } .p-menu .p-menu-item-content .menu-item-label { @@ -20,7 +24,7 @@ export const menuCss = ({ dt }: { dt: (token: string) => string }): string => ` font-family: ${dt('fonts.fontFamily.base')}; font-size: ${dt('fonts.fontSize.200')}; font-weight: ${dt('fonts.fontWeight.regular')}; - color: ${dt('color.fg.muted')}; + color: ${dt('menu.extend.extItem.caption.color')}; } .p-menu .p-menu-item:not(.p-disabled) .p-menu-item-content:hover, @@ -46,7 +50,7 @@ export const menuCss = ({ dt }: { dt: (token: string) => string }): string => ` .p-menu .p-menu-item.p-menuitem-checked > .p-menu-item-content .p-menu-item-icon, .p-menu .p-menu-item.p-focus > .p-menu-item-content .p-menu-item-icon { - color: ${dt('color.fg.inverse.default')}; + color: ${dt('menu.extend.extItem.icon.activeColor')}; } .p-menu .p-menu-item.p-menuitem-checked:not(.p-disabled) > .p-menu-item-content:hover { @@ -60,8 +64,8 @@ export const menuCss = ({ dt }: { dt: (token: string) => string }): string => ` .p-menu .p-menu-submenu-label { text-transform: uppercase; - font-size: ${dt('fonts.fontSize.200')}; font-family: ${dt('fonts.fontFamily.heading')}; - line-height: ${dt('fonts.lineHeight.400')}; + font-size: ${dt('fonts.fontSize.100')}; + line-height: ${dt('fonts.lineHeight.none')}; } `; diff --git a/src/stories/components/menu/examples/menu-basic.component.ts b/src/stories/components/menu/examples/menu-basic.component.ts index 09dd37e4..380d3d79 100644 --- a/src/stories/components/menu/examples/menu-basic.component.ts +++ b/src/stories/components/menu/examples/menu-basic.component.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; import { ExtraMenuComponent, ExtraMenuModel } from '../../../../lib/components/menu/menu.component'; const template = ` -
+
`; diff --git a/src/stories/components/menu/examples/menu-custom.component.ts b/src/stories/components/menu/examples/menu-custom.component.ts index a81d6966..fb7434dc 100644 --- a/src/stories/components/menu/examples/menu-custom.component.ts +++ b/src/stories/components/menu/examples/menu-custom.component.ts @@ -6,7 +6,7 @@ import { } from '../../../../lib/components/menu/menu.component'; const template = ` -
+
}
diff --git a/src/stories/components/menu/examples/menu-grouped.component.ts b/src/stories/components/menu/examples/menu-grouped.component.ts index 6634f38e..3e7cf585 100644 --- a/src/stories/components/menu/examples/menu-grouped.component.ts +++ b/src/stories/components/menu/examples/menu-grouped.component.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; import { ExtraMenuComponent, ExtraMenuModel } from '../../../../lib/components/menu/menu.component'; const template = ` -
+
`; diff --git a/src/stories/components/menu/examples/menu-popup.component.ts b/src/stories/components/menu/examples/menu-popup.component.ts index 3ec4b19c..cfc079ae 100644 --- a/src/stories/components/menu/examples/menu-popup.component.ts +++ b/src/stories/components/menu/examples/menu-popup.component.ts @@ -3,7 +3,7 @@ import { ExtraMenuComponent, ExtraMenuModel } from '../../../../lib/components/m import { ExtraButtonComponent } from '../../../../lib/components/button/button.component'; const template = ` -
+
diff --git a/src/stories/components/menu/examples/menu-with-icons.component.ts b/src/stories/components/menu/examples/menu-with-icons.component.ts index 70b56595..23ca1f38 100644 --- a/src/stories/components/menu/examples/menu-with-icons.component.ts +++ b/src/stories/components/menu/examples/menu-with-icons.component.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; import { ExtraMenuComponent, ExtraMenuModel } from '../../../../lib/components/menu/menu.component'; const template = ` -
+
`;