From 2648a2995514fb64c49879243b154e5658c4da0c Mon Sep 17 00:00:00 2001 From: akarl Date: Tue, 11 Feb 2020 14:15:31 +0100 Subject: [PATCH] =?UTF-8?q?-=20=C3=9Cberarbeitung=20Footer=20-=20Debugging?= =?UTF-8?q?=20Advanced=20Menu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_public/src/less/_modules/footer.less | 2 + .../_public/src/less/_modules/header.less | 20 +- frontend/index/footer-ribbon.tpl | 21 -- frontend/index/footer.tpl | 23 ++ frontend/index/index222.tpl | 286 ------------------ frontend/plugins/advanced_menu/index.tpl | 8 +- 6 files changed, 40 insertions(+), 320 deletions(-) delete mode 100644 frontend/index/footer-ribbon.tpl delete mode 100644 frontend/index/index222.tpl diff --git a/frontend/_public/src/less/_modules/footer.less b/frontend/_public/src/less/_modules/footer.less index 1ba7dba..a616341 100644 --- a/frontend/_public/src/less/_modules/footer.less +++ b/frontend/_public/src/less/_modules/footer.less @@ -5,6 +5,8 @@ footer { @media screen and (min-width: @tabletViewportWidth) { footer { + > .container { + min-width: 100%; } .footer-ribbon { display: block; width: 90%; diff --git a/frontend/_public/src/less/_modules/header.less b/frontend/_public/src/less/_modules/header.less index 56c82d7..ab24bcf 100644 --- a/frontend/_public/src/less/_modules/header.less +++ b/frontend/_public/src/less/_modules/header.less @@ -1,8 +1,5 @@ /* *** HEADER / BASICS ********************************************************************************************** */ -#headerAnker { - color: red; } - /* Header */ .header-main { background: @brand-primary; @@ -181,10 +178,10 @@ .unitize(font-size,35); } } } } } } .navigation-main { - .navigation--link:hover, - .is--active .navigation--link, - .is--hovered .navigation--link, - .is--active .navigation--link:hover { + .navigation--list .navigation--entry .navigation--link:hover, + .navigation--list .navigation--entry.is--active .navigation--link, + .navigation--list .navigation--entry.is--hovered .navigation--link, + .navigation--list .navigation--entry.is--active .navigation--link:hover { background: #fff; font-weight: @font-bold-weight; color: @link-red; @@ -206,6 +203,9 @@ a { display: block; .unitize-padding(8,24); + transition: all 0.3s ease-in-out; + &:hover { + transform: scale(1.1); } .sub--nav-image { width: 100%; height: auto; } @@ -213,4 +213,8 @@ display: block; width: 100%; text-align: center; - font-weight: @font-bold-weight; } } } } } + font-weight: @font-bold-weight; } } } } + .menu--level-0 { + &.columns--4 { + -webkit-column-count: 5; + column-count: 5; } } } diff --git a/frontend/index/footer-ribbon.tpl b/frontend/index/footer-ribbon.tpl deleted file mode 100644 index bde4190..0000000 --- a/frontend/index/footer-ribbon.tpl +++ /dev/null @@ -1,21 +0,0 @@ -
-
- - - - - - -
-
- HORN-GASTRONOMIESHOP - Ihr Shop für Gastronomiebedarf, Hotellerie und Catering -
-
- - - - - -
-
\ No newline at end of file diff --git a/frontend/index/footer.tpl b/frontend/index/footer.tpl index 1a91a5c..ca9e6fe 100644 --- a/frontend/index/footer.tpl +++ b/frontend/index/footer.tpl @@ -2,6 +2,29 @@ {* Footer menu *} {block name='frontend_index_footer_menu'} + {* Footer Top-Styling *} +
+
+ + + + + + +
+
+ HORN-GASTRONOMIESHOP + Ihr Shop für Gastronomiebedarf, Hotellerie und Catering +
+
+ + + + + +
+
+
diff --git a/frontend/index/index222.tpl b/frontend/index/index222.tpl deleted file mode 100644 index 4d591d4..0000000 --- a/frontend/index/index222.tpl +++ /dev/null @@ -1,286 +0,0 @@ -{block name="frontend_index_start"}{/block} -{block name="frontend_index_doctype"} - -{/block} - -{block name='frontend_index_html'} - -{/block} - -{block name='frontend_index_header'} - {include file='frontend/index/header.tpl'} -{/block} - - - - {block name='frontend_index_after_body'}{/block} - - {block name="frontend_index_page_wrap"} -
- - {* Message if javascript is disabled *} - {block name="frontend_index_no_script_message"} - - {/block} - - {block name='frontend_index_before_page'}{/block} - - {* Shop header *} - {block name='frontend_index_navigation'} -
- {* Include the top bar navigation *} - {block name='frontend_index_top_bar_container'} - {include file="frontend/index/topbar-navigation.tpl"} - {/block} - - {block name='frontend_index_header_navigation'} -
- - {* Logo container *} - {block name='frontend_index_logo_container'} - {include file="frontend/index/logo-container.tpl"} - {/block} - - {* Shop navigation *} - {block name='frontend_index_shop_navigation'} - {include file="frontend/index/shop-navigation.tpl"} - {/block} - - {block name='frontend_index_container_ajax_cart'} -
- {/block} -
- {/block} -
- - {* Maincategories navigation top *} - {block name='frontend_index_navigation_categories_top'} - - {/block} - {/block} - - {block name='frontend_index_emotion_loading_overlay'} - {if $hasEmotion} -
- -
- {/if} - {/block} - - {block name='frontend_index_content_main'} -
- - {* Breadcrumb *} - {block name='frontend_index_breadcrumb'} - {if count($sBreadcrumb)} - - {/if} - {/block} - - {* Content top container *} - {block name="frontend_index_content_top"}{/block} - -
- - {* Cookie consent manager*} - {block name='frontend_index_cookie_consent_manager'} - {include file='frontend/index/cookie_consent.tpl'} - {/block} - - {* Sidebar left *} - {block name='frontend_index_content_left'} - {include file='frontend/index/sidebar.tpl'} - {/block} - - {* Main content *} - {block name='frontend_index_content_wrapper'} -
- {block name='frontend_index_content'}{/block} -
- {/block} - - {* Sidebar right *} - {block name='frontend_index_content_right'}{/block} - - {* Last seen products *} - {block name='frontend_index_left_last_articles'} - {if $sLastArticlesShow && !$isEmotionLandingPage} - {* Last seen products *} -
-
- {s namespace="frontend/plugins/index/viewlast" name='WidgetsRecentlyViewedHeadline'}{/s} -
-
-
-
-
- {/if} - {/block} -
-
- {/block} - - {* Footer *} - {block name="frontend_index_footer"} -
- {block name="frontend_index_footer_container"} - {include file='frontend/index/footer-ribbon.tpl'} - {/block} - {block name="frontend_index_footer_container"} - {include file='frontend/index/footer.tpl'} - {/block} -
- {/block} - - {block name='frontend_index_body_inline'}{/block} -
- {/block} - - {* If required add the cookiePermission hint *} - {block name='frontend_index_cookie_permission'} - {if {config name="show_cookie_note"}} - {include file="frontend/_includes/cookie_permission_note.tpl"} - {/if} - {/block} - - {block name="frontend_index_header_javascript"} - {$controllerData = [ - 'vat_check_enabled' => {config name='vatcheckendabled'}, - 'vat_check_required' => {config name='vatcheckrequired'}, - 'register' => {url controller="register"}, - 'checkout' => {url controller="checkout"}, - 'ajax_search' => {url controller="ajax_search" _seo=false}, - 'ajax_cart' => {url controller='checkout' action='ajaxCart' _seo=false}, - 'ajax_validate' => {url controller="register" _seo=false}, - 'ajax_add_article' => {url controller="checkout" action="addArticle" _seo=false}, - 'ajax_listing' => {url module="widgets" controller="listing" action="listingCount" _seo=false}, - 'ajax_cart_refresh' => {url controller="checkout" action="ajaxAmount" _seo=false}, - 'ajax_address_selection' => {url controller="address" action="ajaxSelection" fullPath _seo=false}, - 'ajax_address_editor' => {url controller="address" action="ajaxEditor" fullPath _seo=false} - ]} - - {$themeConfig = [ - 'offcanvasOverlayPage' => $theme.offcanvasOverlayPage - ]} - - {$lastSeenProductsKeys = []} - {foreach $sLastArticlesConfig as $key => $value} - {$lastSeenProductsKeys[$key] = $value} - {/foreach} - - {$lastSeenProductsConfig = [ - 'baseUrl' => $Shop->getBaseUrl(), - 'shopId' => $Shop->getId(), - 'noPicture' => {link file="frontend/_public/src/img/no-picture.jpg"}, - 'productLimit' => {"{config name=lastarticlestoshow}"|floor}, - 'currentArticle' => "" - ]} - - {if $sArticle} - {$lastSeenProductsConfig.currentArticle = $sLastArticlesConfig} - {$lastSeenProductsConfig.currentArticle.articleId = $sArticle.articleID} - {$lastSeenProductsConfig.currentArticle.linkDetailsRewritten = $sArticle.linkDetailsRewrited} - {$lastSeenProductsConfig.currentArticle.articleName = $sArticle.articleName} - {if $sArticle.additionaltext} - {$lastSeenProductsConfig.currentArticle.articleName = $lastSeenProductsConfig.currentArticle.articleName|cat:' ':$sArticle.additionaltext} - {/if} - {$lastSeenProductsConfig.currentArticle.imageTitle = $sArticle.image.description} - {$lastSeenProductsConfig.currentArticle.images = []} - - {foreach $sArticle.image.thumbnails as $key => $image} - {$lastSeenProductsConfig.currentArticle.images[$key] = [ - 'source' => $image.source, - 'retinaSource' => $image.retinaSource, - 'sourceSet' => $image.sourceSet - ]} - {/foreach} - {/if} - - {$csrfConfig = [ - 'generateUrl' => {url controller="csrftoken" fullPath=false}, - 'basePath' => {$Shop->getBasePath()|cat:'/'}, - 'shopId' => $Shop->getId() - ]} - - {if {config name="shareSessionBetweenLanguageShops"} && $Shop->getMain()} - {$csrfConfig['shopId'] = $Shop->getMain()->getId()} - {/if} - - {* let the user modify the data here *} - {block name="frontend_index_header_javascript_data"}{/block} - - - - {include file="frontend/index/datepicker-config.tpl"} - - {if $theme.additionalJsLibraries} - {$theme.additionalJsLibraries} - {/if} - {/block} - - {block name="frontend_index_header_javascript_jquery"} - {* Add the partner statistics widget, if configured *} - {if !{config name=disableShopwareStatistics} } - {include file='widgets/index/statistic_include.tpl'} - {/if} - {/block} - - {* Include jQuery and all other javascript files at the bottom of the page *} - {block name="frontend_index_header_javascript_jquery_lib"} - {compileJavascript timestamp={themeTimestamp} output="javascriptFiles"} - {foreach $javascriptFiles as $file} - {block name="frontend_index_header_javascript_jquery_lib_file"} - - {/block} - {/foreach} - {/block} - -{block name="frontend_index_javascript_async_ready"} - {include file="frontend/index/script-async-ready.tpl"} -{/block} - - - diff --git a/frontend/plugins/advanced_menu/index.tpl b/frontend/plugins/advanced_menu/index.tpl index 21411bf..5e5b330 100644 --- a/frontend/plugins/advanced_menu/index.tpl +++ b/frontend/plugins/advanced_menu/index.tpl @@ -2,11 +2,9 @@ {$columnIndex = 0} {$menuSizePercentage = 100 - (25 * $columnAmount * intval($hasTeaser))} - {$columnCount = 4 - ($columnAmount * intval($hasTeaser))} - -
    - {*
      *} + {$columnCount = 5 - ($columnAmount * intval($hasTeaser))} +
        {block name="frontend_plugins_advanced_menu_list"} {foreach $categories as $category} {if $category.hideTop} @@ -18,7 +16,7 @@ {$categoryLink = $category.external} {/if} -
      • +
      • {block name="frontend_plugins_advanced_menu_list_item"} {if $category.media.path}