diff --git a/feature-libs/user/account/styles/_my-account-v2-user.scss b/feature-libs/user/account/styles/_my-account-v2-user.scss index 2ad257a471f..8dda5e5df33 100644 --- a/feature-libs/user/account/styles/_my-account-v2-user.scss +++ b/feature-libs/user/account/styles/_my-account-v2-user.scss @@ -1,6 +1,6 @@ .cx-my-account-v2-user { border: 1px solid var(--cx-color-medium); - width: 250px; + width: 100%; padding: 20px 5px 5px 25px; gap: 40px; height: 120px; diff --git a/projects/assets/src/translations/en/common.json b/projects/assets/src/translations/en/common.json index 3b148a5f219..8058763b08e 100644 --- a/projects/assets/src/translations/en/common.json +++ b/projects/assets/src/translations/en/common.json @@ -68,6 +68,7 @@ "linkItemInList": "{{title}}. {{position}} of {{listLength}}", "menuButonTitle": "{{title}} Menu" }, + "searchBox": { "placeholder": "Enter product name or SKU", "productSearch": "Find a product", diff --git a/projects/storefrontlib/cms-components/myaccount/my-account-v2/my-account-v2-navigation/my-account-v2-navigation.component.html b/projects/storefrontlib/cms-components/myaccount/my-account-v2/my-account-v2-navigation/my-account-v2-navigation.component.html index 8dd9bd007a2..645b9c71663 100644 --- a/projects/storefrontlib/cms-components/myaccount/my-account-v2/my-account-v2-navigation/my-account-v2-navigation.component.html +++ b/projects/storefrontlib/cms-components/myaccount/my-account-v2/my-account-v2-navigation/my-account-v2-navigation.component.html @@ -4,4 +4,5 @@ [flyout]="false" [ngClass]="(styleClass$ | async) ?? ''" [navAriaLabel]="name$ | async" + [isMyAccount]="isMyAccount" > diff --git a/projects/storefrontlib/cms-components/myaccount/my-account-v2/my-account-v2-navigation/my-account-v2-navigation.component.ts b/projects/storefrontlib/cms-components/myaccount/my-account-v2/my-account-v2-navigation/my-account-v2-navigation.component.ts index d3fa0c009fc..f27442cbbfc 100644 --- a/projects/storefrontlib/cms-components/myaccount/my-account-v2/my-account-v2-navigation/my-account-v2-navigation.component.ts +++ b/projects/storefrontlib/cms-components/myaccount/my-account-v2/my-account-v2-navigation/my-account-v2-navigation.component.ts @@ -12,4 +12,6 @@ import { NavigationComponent } from '../../../navigation'; templateUrl: './my-account-v2-navigation.component.html', standalone: false, }) -export class MyAccountV2NavigationComponent extends NavigationComponent {} +export class MyAccountV2NavigationComponent extends NavigationComponent { + isMyAccount = true; +} diff --git a/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.html b/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.html index 0eb6be824c6..54d55052f7d 100644 --- a/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.html +++ b/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.html @@ -52,13 +52,10 @@ else heading " [ariaLabel]=" - 'navigation.linkItemInList' - | cxTranslate - : { - title: node.title, - position, - listLength, - } + isMyAccount + ? undefined + : ('navigation.linkItemInList' + | cxTranslate: { title: node.title, position, listLength }) " [url]="node.url" [target]="node.target" @@ -152,10 +149,10 @@ {{ node.title }} diff --git a/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.ts b/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.ts index e4eca55899a..424503ac21b 100644 --- a/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.ts +++ b/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.ts @@ -55,6 +55,7 @@ export class NavigationUIComponent implements OnInit, OnDestroy { * Flag indicates whether to reset the state of menu navigation (ie. Collapse all submenus) when the menu is closed. */ @Input() resetMenuOnClose: boolean | undefined; + @Input() isMyAccount: boolean; @Input() navAriaLabel: string | null | undefined; /** diff --git a/projects/storefrontstyles/scss/components/content/navigation/_my-account-v2-navigation.scss b/projects/storefrontstyles/scss/components/content/navigation/_my-account-v2-navigation.scss index 1376d7c791c..3699dc6b0a5 100644 --- a/projects/storefrontstyles/scss/components/content/navigation/_my-account-v2-navigation.scss +++ b/projects/storefrontstyles/scss/components/content/navigation/_my-account-v2-navigation.scss @@ -2,11 +2,11 @@ background: var(--cx-color-inverse); font-family: sans-serif; padding: 5px 5px 5px 5px; - width: 250px; + width: 100%; a { font-size: var(--cx-font-medium); font-weight: bold; - width: 250px; + width: 100%; height: 50px; display: flex; text-indent: 5px; @@ -20,16 +20,19 @@ cx-navigation-ui { background: var(--cx-color-inverse); // Node Heading - span { + span, + h4 { text-indent: 5px; font-weight: bold; display: block; padding: 10px 5px 15px 5px; background-color: var(--cx-color-background); border: 1px solid var(--cx-color-medium); - width: 250px; + width: 100%; height: 40px; margin-top: 20px; + margin-bottom: 0px; + line-height: normal; } > nav > ul { @@ -53,3 +56,27 @@ display: inline-block; } } + +@media screen and (max-width: 544px) { + cx-navigation-ui h4, + span { + font-size: 14px; + } + cx-my-account-v2-navigation a, + cx-my-account-v2-navigation .fas { + height: auto; + padding: 19px 0 19px 2px; + font-size: 12px; + } +} +@media screen and (max-width: 444px) { + cx-navigation-ui h4, + span { + font-size: 11px; + } + cx-my-account-v2-navigation a, + cx-my-account-v2-navigation .fas { + font-size: 10px; + word-wrap: break-word; + } +} diff --git a/projects/storefrontstyles/scss/components/content/navigation/_navigation-ui.scss b/projects/storefrontstyles/scss/components/content/navigation/_navigation-ui.scss index 7671599a169..f0f1770488d 100644 --- a/projects/storefrontstyles/scss/components/content/navigation/_navigation-ui.scss +++ b/projects/storefrontstyles/scss/components/content/navigation/_navigation-ui.scss @@ -321,6 +321,8 @@ %cx-navigation-ui { display: flex; + flex-direction: column; + width: 100%; @include media-breakpoint-up(lg) { background-color: var(--cx-color-text);