diff --git a/src/components/navigation/menu-item/menu-item.scss b/src/components/navigation/menu-item/menu-item.scss index 06b73c8c1f4956cc02c4d425414da79d6bbe7d48..451c3592e43967b64d9b7edb2af24a182356cbbc 100644 --- a/src/components/navigation/menu-item/menu-item.scss +++ b/src/components/navigation/menu-item/menu-item.scss @@ -65,12 +65,13 @@ :host(.hy-menu-item) { a { - @include font-size(15px, 20px); + @include font-size(16px, 20px); @include font-weight($regular); align-items: center; color: var(--brand-main-nearly-black); display: flex; font-family: var(--main-font-family); + letter-spacing: -0.5px; padding: 24px 16px; text-decoration: none; width: 100%; @@ -83,10 +84,9 @@ &.hy-menu-item--mobile { background: linear-gradient(270deg, var(--grayscale-background-box) 0%, var(--grayscale-light) 100%); color: var(--brand-main-light); - padding: 12px 12px 12px 20px; + padding: 14px 12px 14px 20px; - &.is-active, - &.in-active-trail { + &.is-active { @include font-weight($bold); color: var(--grayscale-black); position: relative; @@ -217,7 +217,7 @@ align-items: center; background: linear-gradient(270deg, var(--grayscale-background-box) 0%, var(--grayscale-light) 100%); border-bottom: 0; - border-left: 1px dashed var(--brand-main-light); + border-left: 1px dotted var(--brand-main-light); border-right: 0; border-top: 0; cursor: pointer; diff --git a/src/components/navigation/menu-item/menu-item.tsx b/src/components/navigation/menu-item/menu-item.tsx index 50cf3dae5595fa6e94f247bf5f39dc905a4c8dd0..34c7be30b0bc9507ca5d930701686a405b8a32c4 100644 --- a/src/components/navigation/menu-item/menu-item.tsx +++ b/src/components/navigation/menu-item/menu-item.tsx @@ -212,7 +212,7 @@ export class MenuItem { onClick={() => this.handleClick()} class={'hy-menu-item__button'} > - <hy-icon icon={'hy-icon-caret-right'} size={12} /> + <hy-icon icon={'hy-icon-caret-right'} size={14} /> </button> )} diff --git a/src/components/navigation/menu-mobile-breadcrumb/menu-mobile-breadcrumb.scss b/src/components/navigation/menu-mobile-breadcrumb/menu-mobile-breadcrumb.scss index 5b81b608b074a264d1a31ca81645ad4504e0c0a1..7e18b57364acac02cd48e3358639e24d0d4eb361 100644 --- a/src/components/navigation/menu-mobile-breadcrumb/menu-mobile-breadcrumb.scss +++ b/src/components/navigation/menu-mobile-breadcrumb/menu-mobile-breadcrumb.scss @@ -21,11 +21,12 @@ } &__label { - @include font-size(14px, 20px); + @include font-size(16px, 20px); @include font-weight($regular); align-items: center; color: var(--brand-main-light); display: flex; + letter-spacing: -0.5px; margin-left: 6px; text-align: left; diff --git a/src/components/navigation/menu/menu.scss b/src/components/navigation/menu/menu.scss index 3f5f7a4534fa77337fa4b363145bfe4e6fb42880..a6bd0ac8768afa9f9d2ce66a7377818c2b08c250 100644 --- a/src/components/navigation/menu/menu.scss +++ b/src/components/navigation/menu/menu.scss @@ -33,13 +33,17 @@ } } +.hy-menu-container--mobile { + min-height: calc(100vh - 60px); + overflow-x: hidden; + overflow-y: visible; + padding-top: 32px; +} + .hy-menu { &--mobile { -webkit-overflow-scrolling: touch; flex-flow: column; - min-height: calc(100vh - 60px); - overflow-x: hidden; - overflow-y: visible; padding-left: 12px; padding-right: 12px; transform: translateX(100%); @@ -73,8 +77,10 @@ } &__logo-container { + box-shadow: rgba(14, 104, 139, 0.2) 0 20px 20px -20px; display: inline-block; padding: 16px; + z-index: 100; @include breakpoint($narrow) { padding: 16px 28px; diff --git a/src/components/navigation/menu/menu.tsx b/src/components/navigation/menu/menu.tsx index 6e89a72d4a37acce1e97617720465e3da2002c5b..9ab50e0ac8492b288f3feb13e4159d23912b93f8 100644 --- a/src/components/navigation/menu/menu.tsx +++ b/src/components/navigation/menu/menu.tsx @@ -133,38 +133,40 @@ export class Menu { label={this.logoLabel} /> </div> - <div - id={'menu-bc-container'} - class={{ - 'hy-menu__breadcrumbs': true, - 'is-empty': this.breadcrumbs.length === 0, - }} - > - <hy-menu-language is-mobile={true} data-menu-language={this.dataMenuLanguage} /> - {this.breadcrumbs.length - ? this.breadcrumbs.map((breadcrumb, index) => { - return ( - <hy-menu-mobile-breadcrumb - label-back={this.menuButtonBreadcrumbReturn} - label-front-page={this.labelFrontPage} - label={breadcrumb.label} - bid={breadcrumb.bid} - is-first={index === 0} - /> - ); - }) - : ''} - </div> - <div - aria-hidden={this.menuIsOpen ? 'false' : 'true'} - class={{ - 'hy-menu': true, - 'hy-menu--mobile': true, - 'is-open': this.menuIsOpen, - 'is-demo': this.isDemo, - }} - > - <slot /> + <div class="hy-menu-container--mobile"> + <div + id={'menu-bc-container'} + class={{ + 'hy-menu__breadcrumbs': true, + 'is-empty': this.breadcrumbs.length === 0, + }} + > + <hy-menu-language is-mobile={true} data-menu-language={this.dataMenuLanguage} /> + {this.breadcrumbs.length + ? this.breadcrumbs.map((breadcrumb, index) => { + return ( + <hy-menu-mobile-breadcrumb + label-back={this.menuButtonBreadcrumbReturn} + label-front-page={this.labelFrontPage} + label={breadcrumb.label} + bid={breadcrumb.bid} + is-first={index === 0} + /> + ); + }) + : ''} + </div> + <div + aria-hidden={this.menuIsOpen ? 'false' : 'true'} + class={{ + 'hy-menu': true, + 'hy-menu--mobile': true, + 'is-open': this.menuIsOpen, + 'is-demo': this.isDemo, + }} + > + <slot /> + </div> </div> <div class={'hy-link__donate'}> {this.donateLink diff --git a/src/components/site-header/site-header.scss b/src/components/site-header/site-header.scss index 7c43f2305c9568789255bd8f251be6ef78a97bd7..9dfd65aa8680dc51c78a8b08ab9ba72b3e66653e 100644 --- a/src/components/site-header/site-header.scss +++ b/src/components/site-header/site-header.scss @@ -55,7 +55,7 @@ bottom: 0; overflow: hidden; padding: 0; - position: absolute; + position: fixed; right: 0; top: 0; transform: translateX(100%); @@ -86,7 +86,7 @@ } &.is-open { - position: absolute; + position: fixed; right: 0; top: 32px; transform: translateY(-50%); @@ -127,7 +127,7 @@ .hy-backdrop { bottom: 0; left: 0; - position: absolute; + position: fixed; right: 0; top: 0; visibility: hidden;