diff --git a/packages/cxl-lumo-styles/scss/themes/cxl-accordion-card.scss b/packages/cxl-lumo-styles/scss/themes/cxl-accordion-card.scss index 9c10dd56a..c8a101e24 100644 --- a/packages/cxl-lumo-styles/scss/themes/cxl-accordion-card.scss +++ b/packages/cxl-lumo-styles/scss/themes/cxl-accordion-card.scss @@ -1,4 +1,5 @@ -@import "~@conversionxl/cxl-ui/scss/cxl-card"; +@use "~@conversionxl/cxl-lumo-styles/scss/mq"; +@use "~@conversionxl/cxl-ui/scss/cxl-card"; :host(:not[disabled]) { [part="summary"]:hover { @@ -43,3 +44,14 @@ display: flex; flex-wrap: wrap; } + +:host { + box-sizing: border-box; + max-width: calc(100vw - 2 * var(--cxl-wrap-padding)); +} + +@media #{mq.$small} { + :host { + max-width: initial; + } +} diff --git a/packages/cxl-lumo-styles/scss/themes/vaadin-overlay.scss b/packages/cxl-lumo-styles/scss/themes/vaadin-overlay.scss index 59ea01edc..fec93c65f 100644 --- a/packages/cxl-lumo-styles/scss/themes/vaadin-overlay.scss +++ b/packages/cxl-lumo-styles/scss/themes/vaadin-overlay.scss @@ -34,11 +34,9 @@ &::part(overlay), &::part(content) { - /* Repeated as fallback for older browsers*/ - height: calc(100vh - 40px); - height: calc(100dvh - 40px); - max-height: calc(100vh - 40px); - max-height: calc(100dvh - 40px); + /* Repeated as fallback for older browsers */ + max-height: calc(100% - var(--cxl-marketing-nav-height)); + max-height: calc(100dvh - var(--cxl-marketing-nav-height)); } &::part(backdrop) { @@ -50,42 +48,23 @@ 0 8px 24px -4px var(--lumo-shade-5pct); } - &::part(overlay), - &::part(content) { - height: initial; - max-height: initial; - } - &::part(content) { padding: var(--lumo-space-s); } + /* It's necessary to define some properties again in a media query, because of vaadin-overlay hard coded styles at 420px*/ @media (max-width: 568px), (max-height: 568px) { top: 0 !important; - right: 0 !important; bottom: var(--vaadin-overlay-viewport-bottom, 0) !important; - left: 0 !important; align-items: stretch !important; justify-content: flex-end !important; - [part='overlay'] { - top: 0 !important; - right: 0 !important; + position: relative; + height: 100dvh; + max-height: calc(100dvh - var(--cxl-marketing-nav-height)); bottom: var(--vaadin-overlay-viewport-bottom, 0) !important; - left: 0 !important; - align-items: stretch !important; - justify-content: flex-end !important; - width: 100vw; - /* Repeated as fallback for older browsers*/ - height: calc(100vh - 40px) !important; - height: calc(100dvh - 40px) !important; - max-height: calc(100vh - 40px) !important; - max-height: calc(100dvh - 40px) !important; - - border-top: 1px solid var(--lumo-shade-5pct); - border-radius: 0; - box-shadow: none; + width: 100%; } /* The content part scrolls instead of the overlay part, because of the gradient fade-out */ diff --git a/packages/cxl-ui/scss/cxl-marketing-nav.scss b/packages/cxl-ui/scss/cxl-marketing-nav.scss index 4a66cfbdd..4170b99ee 100644 --- a/packages/cxl-ui/scss/cxl-marketing-nav.scss +++ b/packages/cxl-ui/scss/cxl-marketing-nav.scss @@ -21,6 +21,7 @@ justify-content: center; width: 100%; max-width: 100vw; + min-height: var(--cxl-marketing-nav-min-height, 44px); padding: 0 var(--lumo-space-m); overflow: hidden; diff --git a/packages/cxl-ui/src/components/cxl-marketing-nav.js b/packages/cxl-ui/src/components/cxl-marketing-nav.js index e1d654b78..ea226d068 100644 --- a/packages/cxl-ui/src/components/cxl-marketing-nav.js +++ b/packages/cxl-ui/src/components/cxl-marketing-nav.js @@ -375,7 +375,6 @@ export class CXLMarketingNavElement extends LitElement { const overflowMenuButton = menu.shadowRoot.querySelector( 'vaadin-menu-bar-button[part="overflow-button"]' ); - overflowMenuButton.toggleAttribute('hidden', false); if (overflowMenuButton && !overflowMenuButton.iconFixed) { const menuIcon = document.createElement('vaadin-icon');