From c27eabe928b548a1c47398dd8e848adb6d760f62 Mon Sep 17 00:00:00 2001 From: Tim Sievers Date: Tue, 25 Jan 2022 11:25:39 +0100 Subject: [PATCH] DmfManuTheme v2.0.5 - Optimizations --- composer.json | 2 +- .../src/scss/abstract/variables/default.scss | 106 ++++++++++++++++++ .../app/storefront/src/scss/variables.scss | 1 + src/Resources/views/storefront/base.html.twig | 1 - .../storefront/layout/breadcrumb.html.twig | 34 +++++- .../storefront/page/account/sidebar.html.twig | 2 +- 6 files changed, 142 insertions(+), 4 deletions(-) create mode 100644 src/Resources/app/storefront/src/scss/abstract/variables/default.scss diff --git a/composer.json b/composer.json index b7db208..03ce058 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "dmf/sw6-manu-theme", "description": "Manu Theme", - "version": "2.0.4", + "version": "2.0.5", "type": "shopware-platform-plugin", "authors": [ { diff --git a/src/Resources/app/storefront/src/scss/abstract/variables/default.scss b/src/Resources/app/storefront/src/scss/abstract/variables/default.scss new file mode 100644 index 0000000..97f2137 --- /dev/null +++ b/src/Resources/app/storefront/src/scss/abstract/variables/default.scss @@ -0,0 +1,106 @@ +/* + _ __ + | | / _| + __| |_ __ ___ | |_ + / _` | '_ ` _ \| _| +| (_| | | | | | | | + \__,_|_| |_| |_|_| + +Copyright (c) digital.manufaktur GmbH + +Default Variables +============================================== + +*/ + +// Sizes + +$dmf-spacer: 16px !default; +$dmf-font-size-base: 14px !default; +$dmf-line-height-base: 1.6 !default; + +// Border + +$dmf-border-radius: 5px !default; +$dmf-btn-border-radius: 5px !default; +$dmf-btn-border-width: 1px !default; + +// Headlines + +$dmf-font-size-h1: 36px !default; +$dmf-font-size-h2: 24px !default; +$dmf-font-size-h3: 21px !default; +$dmf-font-size-h4: 18px !default; +$dmf-font-size-h5: 16px !default; +$dmf-font-size-h6: 14px !default; + +// Paddings + +$dmf-header-padding-top: 16px !default; +$dmf-header-padding-bottom: 16px !default; + +// Width + +$dmf-header-logo-max-width-desktop: 140px !default; +$dmf-header-logo-max-width-mobile: 90px !default; + + +// Colors + +$sw-color-brand-primary: #0DB669 !default; +$sw-color-brand-primary-alt: #CDDD5D !default; +$sw-color-brand-secondary: #F0F5F3 !default; +$border-color: #DEE8E3 !default; +$sw-background-color: #FFFFFF !default; +$sw-base-gray: #F5F5F5 !default; +$sw-color-success: #3CC261 !default; +$sw-color-info: #26A0CF !default; +$sw-color-warning: #FFCC5D !default; +$sw-color-danger: #D63D2C !default; +$sw-text-color: #242424 !default; +$sw-headline-color: #0DB669 !default; +$sw-link-color: #808080 !default; +$sw-color-price: #242424 !default; +$sw-color-buy-button: #0DB669 !default; +$sw-color-buy-button-text: #F0F5F3 !default; +$dmf-breadcrumb-background-color: #FFFFFF !default; +$dmf-breadcrumb-text-color: #929292 !default; +$dmf-header-background-color: #F0F5F3 !default; +$dmf-header-text-color: #242424 !default; +$dmf-header-cart-quantity-background: #D63D2C !default; +$dmf-navigation-background-color: #F0F5F3 !default; +$dmf-navigation-text-color: #242424 !default; +$dmf-navigation-text-color-hover: #242424 !default; +$dmf-header-megamenu-background-color: #FFFFFF !default; +$dmf-header-megamenu-color: #242424 !default; +$dmf-header-megamenu-color-hover: #0DB669 !default; +$dmf-header-search-background: #FFF !default; +$dmf-header-search-background-focus: #FFF !default; +$dmf-header-search-border: #DEE8E3 !default; +$dmf-header-search-border-focus: #0DB669 !default; +$dmf-header-search-color: #242424 !default; +$dmf-header-search-placeholder-color: rgba(#242424, 0.5) !default; +$dmf-customer-support-color: #808080 !default; +$dmf-footer-background-color: #F0F5F3 !default; +$dmf-footer-border-color: #F0F5F3 !default; +$dmf-footer-text-color: #242424 !default; +$dmf-newsletter-background-color: #CDDD5D !default; +$dmf-newsletter-text-color: #242424 !default; +$dmf-input-bg: #FFFFFF !default; +$dmf-input-focus-bg: #FFFFFF !default; +$dmf-input-border-color: #242424 !default; +$dmf-input-focus-border-color: #0DB669 !default; +$dmf-input-plaintext-color: #242424 !default; +$dmf-input-color: #242424 !default; +$dmf-input-focus-color: #242424 !default; +$dmf-input-placeholder-color: #C3C3C3 !default; +$dmf-product-box-background-color: transparent !default; +$dmf-product-box-image-background-color: #f0f5f3 !default; +$dmf-product-box-border-color: transparent !default; +$dmf-wishlist-fill-color: #FF0000 !default; +$dmf-detail-buybox-background: transparent !default; +$dmf-detail-buybox-border: transparent !default; +$dmf-detail-media-background: #F0F5F3 !default; +$dmf-detail-media-border: #F0F5F3 !default; +$dmf-account-order-btn-background-color: #FFFFFF !default; +$dmf-account-order-btn-color: #242424 !default; diff --git a/src/Resources/app/storefront/src/scss/variables.scss b/src/Resources/app/storefront/src/scss/variables.scss index 5a284c3..31a605d 100755 --- a/src/Resources/app/storefront/src/scss/variables.scss +++ b/src/Resources/app/storefront/src/scss/variables.scss @@ -24,4 +24,5 @@ Contains the imports to variables and functions. /* * Variables * ---------- */ +@import "abstract/variables/default"; @import "abstract/variables/bootstrap"; diff --git a/src/Resources/views/storefront/base.html.twig b/src/Resources/views/storefront/base.html.twig index 4cd93e9..de69c64 100644 --- a/src/Resources/views/storefront/base.html.twig +++ b/src/Resources/views/storefront/base.html.twig @@ -1,7 +1,6 @@ {% sw_extends '@Storefront/storefront/base.html.twig' %} {% block base_header %} -
{% block base_header_inner %} {{ parent() }} diff --git a/src/Resources/views/storefront/layout/breadcrumb.html.twig b/src/Resources/views/storefront/layout/breadcrumb.html.twig index 3e40a2b..dd94948 100644 --- a/src/Resources/views/storefront/layout/breadcrumb.html.twig +++ b/src/Resources/views/storefront/layout/breadcrumb.html.twig @@ -1,6 +1,38 @@ {% sw_extends '@Storefront/storefront/layout/breadcrumb.html.twig' %} {% block layout_breadcrumb_list_item %} + {% if loop.first %} + {% block layout_breadcrumb_home_item %} + {% if theme_config('dmf-breadcrumb-home') == 1 and (theme_config('dmf-breadcrumb-size') == false or breadcrumbCategories|length > 0) %} + {% set breadcrumbIndex = 1 %} +
  • + + + {% if theme_config('dmf-breadcrumb-home-icon-label') == "icon" %} + {% sw_icon 'shop' style { 'size': '1rem', 'pack': 'default'} %} + {% else %} + + {{ config('core.basicInformation.shopName') }} + + {% endif %} + + +
    • + {% endif %} + {% block layout_breadcrumb_home_placeholder %} +
    + {% sw_icon 'arrow-medium-right' style { 'size': 'fluid', 'pack': 'solid'} %} +
    + {% endblock %} + {% endblock %} + {% endif %}
  • {{ name }} - + {% endif %}
    • {% endblock %} diff --git a/src/Resources/views/storefront/page/account/sidebar.html.twig b/src/Resources/views/storefront/page/account/sidebar.html.twig index 4b4f92f..4b20972 100644 --- a/src/Resources/views/storefront/page/account/sidebar.html.twig +++ b/src/Resources/views/storefront/page/account/sidebar.html.twig @@ -87,7 +87,7 @@ {% endif %} {% endblock %} - + {% block page_account_sidebar_footer %} {% endblock %}