From bad40cb6144a6ea2f1f2201344ec0ca5ca55ab59 Mon Sep 17 00:00:00 2001 From: Florian Eisenmenger Date: Tue, 22 Mar 2022 11:30:43 +0100 Subject: [PATCH] check --- .../storefront/src/scss/layout/_footer.scss | 146 +++++++------- .../storefront/src/scss/layout/_header.scss | 7 + .../app/storefront/src/scss/overrides.scss | 4 + .../storefront/layout/footer/footer.html.twig | 20 ++ .../storefront/layout/header/header.html.twig | 2 +- .../storefront/src/scss/layout/_footer.scss | 187 ++++++++++-------- .../storefront/src/scss/layout/_header.scss | 21 +- .../app/storefront/src/scss/overrides.scss | 10 +- .../storefront/layout/footer/footer.html.twig | 20 ++ .../storefront/layout/header/header.html.twig | 2 +- 10 files changed, 257 insertions(+), 162 deletions(-) diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_footer.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_footer.scss index d7a9bc1..4659b0a 100644 --- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_footer.scss +++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_footer.scss @@ -1,99 +1,101 @@ - #collapseFooterCustom { - p { - margin-bottom: 5px; - img { - margin-bottom: 8px; + p { + margin-bottom: 5px; + img { + margin-bottom: 8px; + } } - } } .footer-newsletter { - .newsletter-inner-text { - font-size: 18px; - line-height: 24px; - } - .footer-newsletter-column-input-email { - border-bottom: 2px solid $sw-color-brand-primary; - margin: 0 15px; - padding: 0; - } - .form-control, - .input-group-append .btn { - border: none; - } - .form-control { - padding-top: 0; - padding-left: 0; - padding-bottom: 0; - font-size: 18px; - line-height: 24px; - } + .newsletter-inner-text { + font-size: 18px; + line-height: 24px; + } + .footer-newsletter-column-input-email { + border-bottom: 2px solid $sw-color-brand-primary; + margin: 0 15px; + padding: 0; + } + .form-control, + .input-group-append .btn { + border: none; + } + .form-control { + padding-top: 0; + padding-left: 0; + padding-bottom: 0; + font-size: 18px; + line-height: 24px; + } } .footer-hotline-column { - .footer-contact-hotline { - margin-bottom: 8px; - a:not(.btn) { - margin-top: 16px; - margin-bottom: 0; - line-height: 15px; + .footer-contact-hotline { + margin-bottom: 8px; + a:not(.btn) { + margin-top: 16px; + margin-bottom: 0; + line-height: 15px; + } } - } - .footer-contact-form { - margin-top: 0; - a { - color: #222; - text-decoration: underline; - &:hover { - color: #222; - text-decoration: none; - } + .footer-contact-form { + margin-top: 0; + a { + color: #222; + text-decoration: underline; + &:hover { + color: #222; + text-decoration: none; + } + } } - } } - .footer-column-headline { - margin-bottom: 0; - &:before { - display: none; - } + margin-bottom: 0; + &:before { + display: none; + } } .footer-link-item { - a { - &:after { - top: 75%; + a { + &:after { + top: 75%; + } } - } } +.footer-stores { + margin-top: 15px; + ; +} @media (min-width: 768px) { - .footer-link-item { - padding: 0; - } + .footer-link-item { + padding: 0; + } } .social-icons { - display: flex; - justify-content: center; - margin-bottom: 10px; - .icon { - border: 2px solid $sw-color-brand-primary; - border-radius: 50%; - width: 40px; - height: 40px; - margin: 0 8px; - &.icon-facebook { - padding: 8px; + display: flex; + justify-content: center; + margin-bottom: 10px; + .icon { + border: 2px solid $sw-color-brand-primary; + border-radius: 50%; + width: 40px; + height: 40px; + margin: 0 8px; + &.icon-facebook { + padding: 8px; + } + &.icon-instagram { + padding: 5px; + } } - &.icon-instagram { - padding: 5px; + svg { + color: $sw-color-brand-primary; } - } - svg { - color: $sw-color-brand-primary; - } } \ No newline at end of file diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_header.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_header.scss index ba37cf8..76ae002 100644 --- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_header.scss +++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_header.scss @@ -28,6 +28,13 @@ background: transparent; } } + .header-hotline-btn:hover { + svg { + path { + stroke: $sw-color-brand-primary; + } + } + } } .header-actions-col { diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/overrides.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/overrides.scss index 77d06f2..97c988d 100644 --- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/overrides.scss +++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/overrides.scss @@ -41,6 +41,10 @@ h6 { font-family: $sw-font-family-base !important; } +.breadcrumb-container { + display: none; +} + .cms-block { .category { font-size: 16px; diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/footer/footer.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/footer/footer.html.twig index abdd7c6..f894f64 100644 --- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/footer/footer.html.twig +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/footer/footer.html.twig @@ -1,5 +1,25 @@ {% sw_extends '@Storefront/storefront/layout/footer/footer.html.twig' %} +{% block zen_layout_footer_navigation_hotline_content %} +
+
+

+ {{ 'footer.serviceHotline'|trans|sw_sanitize }} +

+
+
+ {{ 'footer.serviceContactLink'|trans({ + '%url%': path('frontend.cms.page', { id: config('core.basicInformation.contactPage') }) + })|raw }} +
+
+ {{ 'footer.serviceStore'|trans|sw_sanitize }} +
+
+{% endblock %} + {% block layout_footer_payment_shipping_logos %} {% endblock %} diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/header/header.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/header/header.html.twig index 654a085..39a9c58 100644 --- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/header/header.html.twig +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/header/header.html.twig @@ -33,7 +33,7 @@ {% block layout_header_hotline %}
- + diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_footer.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_footer.scss index 69be2ca..398d6fc 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_footer.scss +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_footer.scss @@ -1,108 +1,133 @@ - #collapseFooterCustom { - p { - margin-bottom: 5px; - img { - margin-bottom: 8px; + p { + margin-bottom: 5px; + img { + margin-bottom: 8px; + } } - } } .footer-newsletter { - .footer-logo { - max-width: 170px; - } - .newsletter-inner-text { - font-size: 18px; - line-height: 24px; - } - .footer-newsletter-column-input-email { - border-bottom: 2px solid #FFF; - margin: 0 15px; - padding: 0; - } - .form-control, - .input-group-append .btn { - border: none; - .icon { - color: #FFF; + width: 100vw; + position: relative; + left: 50%; + right: 50%; + margin-left: -50vw; + margin-right: -50vw; + .container { + padding-left: 40px; + padding-right: 40px; + @media (min-width: 768px) { + padding-left: 70px; + } + @media (min-width: 1260px) { + padding-left: 110px; + } + .footer-logo { + max-width: 170px; + } + .newsletter-inner-text { + font-size: 18px; + line-height: 24px; + max-width: 450px; + } + .footer-newsletter-column-input-email { + border-bottom: 2px solid #FFF; + margin: 0 15px; + padding: 0; + } + .form-control, + .input-group-append .btn { + border: none; + .icon { + color: #FFF; + } + } + .form-control::-webkit-input-placeholder { + color: #FFF; + } + .form-control { + padding-top: 0; + padding-left: 0; + padding-bottom: 0; + font-size: 18px; + line-height: 24px; + } } - } - .form-control::-webkit-input-placeholder { - color: #FFF; - } - .form-control { - padding-top: 0; - padding-left: 0; - padding-bottom: 0; - font-size: 18px; - line-height: 24px; - } } .footer-hotline-column { - .footer-contact-hotline { - margin-bottom: 8px; - a:not(.btn) { - margin-top: 16px; - margin-bottom: 0; - line-height: 15px; + .footer-contact-hotline { + margin-bottom: 8px; + a:not(.btn) { + margin-top: 16px; + margin-bottom: 0; + line-height: 15px; + } } - } - .footer-contact-form { - margin-top: 0; - a { - color: #222; - text-decoration: underline; - &:hover { - color: #222; - text-decoration: none; - } + .footer-contact-form { + margin-top: 0; + a { + color: #222; + text-decoration: underline; + &:hover { + color: #222; + text-decoration: none; + } + } } - } } +.footer-stores { + margin-top: 15px; + ; +} .footer-column-headline { - margin-bottom: 0; - &:before { - display: none; - } + margin-bottom: 0; + &:before { + display: none; + } } .footer-link-item { - a { - &:after { - top: 75%; + a { + &:after { + top: 75%; + } } - } } - @media (min-width: 768px) { - .footer-link-item { - padding: 0; - } + .footer-link-item { + padding: 0; + } } .social-icons { - display: flex; - justify-content: center; - margin-bottom: 10px; - .icon { - border: 2px solid $sw-color-brand-primary; - border-radius: 50%; - width: 40px; - height: 40px; - margin: 0 8px; - &.icon-facebook { - padding: 8px; - } - &.icon-instagram { - padding: 5px; + display: flex; + justify-content: center; + margin-bottom: 10px; + .icon { + border: 2px solid $sw-color-brand-primary; + background-color: $sw-color-brand-primary; + border-radius: 50%; + width: 40px; + height: 40px; + margin: 0 8px; + &.icon-facebook { + padding: 8px; + } + &.icon-instagram { + padding: 5px; + } + svg { + color: #fff; + } + &:hover { + svg { + color: #222; + } + } } - } - svg { - color: $sw-color-brand-primary; - } } \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header.scss index 662f881..d955723 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header.scss +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header.scss @@ -23,7 +23,6 @@ @media (min-width: 992px) { .header-main .header-inner { padding-top: 15px; - padding-bottom: 25px; background: #fff; border-bottom: 1px solid #ACCD93; } @@ -31,7 +30,6 @@ .header-row { padding-top: 10px; - padding-bottom: 15px; } .header-main { @@ -48,6 +46,13 @@ background: transparent; } } + .header-hotline-btn:hover { + svg { + path { + stroke: $sw-color-brand-primary; + } + } + } } .header-nav-col { @@ -67,6 +72,10 @@ } } +.is-lo-full-width .container { + max-width: 1120px; +} + .nav-header>.container { padding-left: 0; padding-right: 0; @@ -125,14 +134,18 @@ } } +.navigation-flyout-categories.is-level-0 > .navigation-flyout-col { + margin-bottom: 10px; +} + a.navigation-flyout-link[title~="Sale"] { font-weight: 700; text-transform: uppercase; } .navigation-flyout .container>.navigation-flyout-content:first-child { - padding-top: 60px; - padding-bottom: 30px; + padding-top: 30px; + padding-bottom: 15px; } .navigation-flyout-categories:not(.is-level-0) { diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss index 68f5aac..7455d7a 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss @@ -44,6 +44,10 @@ h6 { font-family: $sw-font-family-base !important; } +.breadcrumb-container { + display: none; +} + .cms-block { .category { font-size: 16px; @@ -67,14 +71,14 @@ h6 { .btn-outline-primary { border: 2px solid #86B04B !important; border-radius: 3px; - font-size: 16px; + font-size: 18px; font-weight: 600; letter-spacing: 1px; - text-transform: uppercase; padding: 5px 32px !important; } -.aku-cms-factory-element { +.aku-cms-factory-element, +.cms-element-text { .btn-outline-primary { background-color: $sw-color-brand-primary; color: #fff; diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/footer/footer.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/footer/footer.html.twig index abdd7c6..f894f64 100644 --- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/footer/footer.html.twig +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/footer/footer.html.twig @@ -1,5 +1,25 @@ {% sw_extends '@Storefront/storefront/layout/footer/footer.html.twig' %} +{% block zen_layout_footer_navigation_hotline_content %} +
+
+

+ {{ 'footer.serviceHotline'|trans|sw_sanitize }} +

+
+
+ {{ 'footer.serviceContactLink'|trans({ + '%url%': path('frontend.cms.page', { id: config('core.basicInformation.contactPage') }) + })|raw }} +
+
+ {{ 'footer.serviceStore'|trans|sw_sanitize }} +
+
+{% endblock %} + {% block layout_footer_payment_shipping_logos %} {% endblock %} diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/header/header.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/header/header.html.twig index 654a085..a0d8a3a 100644 --- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/header/header.html.twig +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/header/header.html.twig @@ -33,7 +33,7 @@ {% block layout_header_hotline %}
- +