diff --git a/frontend/_public/src/less/_modules/footer.less b/frontend/_public/src/less/_modules/footer.less new file mode 100644 index 0000000..225794b --- /dev/null +++ b/frontend/_public/src/less/_modules/footer.less @@ -0,0 +1,15 @@ + + + + + + +@media screen and (min-width: 48em) { + .footer-main { + background: @brand-footer; + } + + .footer-main .footer--column { + width: 33%; + } +} \ No newline at end of file diff --git a/frontend/_public/src/less/_modules/header.less b/frontend/_public/src/less/_modules/header.less index c0c597d..2d8215c 100644 --- a/frontend/_public/src/less/_modules/header.less +++ b/frontend/_public/src/less/_modules/header.less @@ -22,13 +22,14 @@ /* Suche */ .entry--search { + width: 60%!important; margin-top: 1.5em!important; background: @brand-primary!important; .main-search--form { box-shadow: none!important; label{ display: inline-block; - width: auto; + width: 70px; padding: .5em 1em 0 0; float: left; text-transform: uppercase; @@ -36,7 +37,7 @@ font-size: 16px; color: #fff; } input{ - width: 80%!important; + width: calc(~'100% - 140px')!important; float: left; border: none; border-radius: 0; @@ -47,32 +48,12 @@ padding-bottom: 0.2em!important; height: 2em!important; } button{ - width: 8% !important; + width: 40px!important; float: left; - right: 3%!important; + right: 25px!important; i{ color: #fff; } } } } -/* Main Navigation */ -.navigation--list-wrapper { - padding: 0; - text-align: center; - .navigation--list{ - width: auto; - display: inline-block; - .is--home{ - display: none; } - li { - .navigation--link { - span{ - display: block; - text-transform: uppercase; - font-weight: 700; } - .wbn-icon-set { - margin-bottom: 0.5em; - &:before { - font-size: 35px; } } } } } } - /* Service Navigation */ .shop--navigation { @@ -142,7 +123,9 @@ .info--delivery { font-size: 12px; } } &.entry--delivery { - margin-right: 1%; } } } + margin-right: 1%; } + &.entry--search { + height: auto; } } } .entry--delivery, .entry--support, .entry--account, @@ -160,4 +143,65 @@ .navigation--entry { height: auto; } } } } + +/* Main Navigation */ +.navigation--list-wrapper { + padding: 0; + text-align: center; + .navigation--list{ + top: 5px; + width: auto; + display: inline-block; + .is--home{ + display: none; } + li { + .navigation--link { + border-radius: 0; + border-color: #fff; + border-width: 0 1px; + border-style: solid; + span{ + display: block; + text-transform: uppercase; + font-weight: 700; } + .wbn-icon-set { + min-height: 35px; + margin-bottom: 0.5em; + &:before { + font-size: 35px; } } } } } } + +.navigation-main { + .navigation--link:hover, + .is--active .navigation--link, + .is--hovered .navigation--link, + .is--active .navigation--link:hover { + background-image: linear-gradient(to bottom, #fff 0%, #fff 40%, @brand-primary 80%, @brand-primary 100%)!important; + font-weight: 700; + color: #fff } } + +.advanced-menu { + border-top: 1px solid #12428e; + .button-container { + background-color: @brand-primary!important; } + .menu--list { + width: 100%; + display: block!important; + .menu--list-item { + display: block; + float: left; + width: 16.6666%; + padding: 0 0 1em 0; + a { + display: block; + padding: 0.5em 1.5em; + .sub--nav-image { + width: 100%; + height: auto; } + .sub--nav-title{ + display: block; + width: 100%; + text-align: center; + font-weight: 700; } } } } } + + .cssAnker {} \ No newline at end of file diff --git a/frontend/_public/src/less/_modules/page.less b/frontend/_public/src/less/_modules/page.less index 5dc2bad..f987715 100644 --- a/frontend/_public/src/less/_modules/page.less +++ b/frontend/_public/src/less/_modules/page.less @@ -18,7 +18,7 @@ @media (min-width: 48em) { .header--navigation { - max-width: calc(~"100% - 24em"); - margin: 0 12em; + min-width: 90%; + margin: 0 auto; } } \ No newline at end of file diff --git a/frontend/_public/src/less/_variables/variables.less b/frontend/_public/src/less/_variables/variables.less new file mode 100644 index 0000000..c36ad83 --- /dev/null +++ b/frontend/_public/src/less/_variables/variables.less @@ -0,0 +1,5 @@ +/* *** COLORS ******************************************************************************************************* */ + +@brand-footer: #1D4788; +@brand-payment: #1A3764; + diff --git a/frontend/_public/src/less/all.less b/frontend/_public/src/less/all.less index de7a880..3404228 100644 --- a/frontend/_public/src/less/all.less +++ b/frontend/_public/src/less/all.less @@ -1,12 +1,6 @@ @import "_modules/page"; -//@import "_modules/account"; -//@import "_modules/cart"; -//@import "_modules/confirm"; -//@import "_modules/emotion"; -//@import "_modules/finish"; -//@import "_modules/footer"; -//@import "_modules/global"; @import "_modules/header"; +@import "_modules/footer"; //@import "_modules/listing"; //@import "_modules/main-navigation"; //@import "_modules/product-box"; @@ -16,14 +10,11 @@ //@import "_components/offcanvas-menu"; //@import "_components/product-slider"; -//@import "_mixins/background"; -//@import "_mixins/clear"; -//@import "_mixins/css_class"; -//@import "_mixins/flexbox"; @import "_mixin/fonts"; //@import "_mixins/functions"; //@import "_mixins/margin"; +@import "_variables/variables"; //@import "_variables/font-sizes"; //@import "_variables/structure"; //@import "_variables/typography"; diff --git a/frontend/home/index.tpl b/frontend/home/index.tpl new file mode 100644 index 0000000..5dffe61 --- /dev/null +++ b/frontend/home/index.tpl @@ -0,0 +1,71 @@ +{extends file='frontend/index/index.tpl'} + +{block name="frontend_index_content_top"}{/block} + +{* Page title *} +{block name='frontend_index_header_title'}{strip} + {if $sCategoryContent.metaTitle} + {$sCategoryContent.metaTitle|escapeHtml} | {{config name=sShopname}|escapeHtml} + {else} + {$smarty.block.parent} + {/if} +{/strip}{/block} + +{* Canonical URL *} +{block name='frontend_index_header_canonical'} + +{/block} + +{* Main content *} +{block name='frontend_index_content'} +
+ + {block name='frontend_home_index_banner'} + {* Banner *} + {include file='frontend/listing/banner.tpl'} + {/block} + + {block name='frontend_home_index_text'} + {* Category headline *} + {if !$hasEmotion} + {include file='frontend/listing/text.tpl'} + {/if} + {/block} + + {* Promotion *} + {block name='frontend_home_index_promotions'} + {if $hasCustomerStreamEmotion} + {action module=frontend controller=listing action=layout sCategory=$sCategoryContent.id} + {elseif $hasEmotion} +
+ {foreach $emotions as $emotion} + {block name='frontend_home_index_emotion_wrapper'} + {include file="frontend/_includes/emotion.tpl"} + {/block} + {/foreach} +
+ {/if} + {/block} + + {block name='frontend_home_index_blog'} + {* Blog Articles *} + {if $sBlog.sArticles|@count} +
+

{s name='WidgetsBlogHeadline'}{/s}:

+ {foreach from=$sBlog.sArticles item=article key=key name="counter"} + {include file="frontend/blog/box.tpl" sArticle=$article key=$key homepage=true} + {/foreach} +
+ {/if} + {/block} + + {* Tagcloud *} + {block name='frontend_home_index_tagcloud'} + {if {config name=show namespace=TagCloud } && !$isEmotionLandingPage} + {action module=widgets controller=listing action=tag_cloud sController=index} + {/if} + {/block} +
+{/block} + +{block name='frontend_index_left_last_articles'}{/block} diff --git a/frontend/index/footer-navigation.tpl b/frontend/index/footer-navigation.tpl new file mode 100644 index 0000000..44a0773 --- /dev/null +++ b/frontend/index/footer-navigation.tpl @@ -0,0 +1,150 @@ +{namespace name="frontend/index/menu_footer"} + +{* Service hotline *} +{block name="frontend_index_footer_column_service_hotline"} +
+ {block name="frontend_index_footer_column_service_hotline_headline"} +
{s name="sFooterServiceHotlineHead"}{/s}
+ {/block} + + {block name="frontend_index_footer_column_service_hotline_content"} +
+

{s name="sFooterServiceHotline"}{/s}

+
+ {/block} +
+{/block} + +{block name="frontend_index_footer_column_service_menu"} +
+ {block name="frontend_index_footer_column_service_menu_headline"} +
{s name="sFooterShopNavi1"}{/s}
+ {/block} + + {block name="frontend_index_footer_column_service_menu_content"} + + {/block} +
+{/block} + +{block name="frontend_index_footer_column_information_menu"} +
+ {block name="frontend_index_footer_column_information_menu_headline"} +
{s name="sFooterShopNavi2"}{/s}
+ {/block} + + {block name="frontend_index_footer_column_information_menu_content"} + + {/block} +
+{/block} + +{block name="frontend_index_footer_column_newsletter"} +
+ {block name="frontend_index_footer_column_newsletter_headline"} +
{s name="sFooterNewsletterHead"}{/s}
+ {/block} + + {block name="frontend_index_footer_column_newsletter_content"} +
+

+ {s name="sFooterNewsletter"}{/s} +

+ + {block name="frontend_index_footer_column_newsletter_form"} + + {/block} +
+ {/block} +
+{/block} diff --git a/frontend/index/footer.tpl b/frontend/index/footer.tpl new file mode 100644 index 0000000..c1270eb --- /dev/null +++ b/frontend/index/footer.tpl @@ -0,0 +1,47 @@ +{* Footer menu *} +{block name='frontend_index_footer_menu'} +
+ {include file='frontend/index/footer-navigation.tpl'} +
+{/block} + +{* Copyright in the footer *} +{block name='frontend_index_footer_copyright'} +
+ + {* Vat info *} + {block name='frontend_index_footer_vatinfo'} +
+

+ {if $sOutputNet} + {s name='FooterInfoExcludeVat' namespace="frontend/index/footer"}{/s} + {else} + {s name='FooterInfoIncludeVat' namespace="frontend/index/footer"}{/s} + {/if} +

+
+ {/block} + + {block name='frontend_index_footer_minimal'} + {include file="frontend/index/footer_minimal.tpl" hideCopyrightNotice=true} + {/block} + + {* Shopware footer *} + {block name="frontend_index_shopware_footer"} + + {* Copyright *} + {block name="frontend_index_shopware_footer_copyright"} +
+ {s name="IndexCopyright"}{/s} +
+ {/block} + + {* Logo *} + {block name="frontend_index_shopware_footer_logo"} + + {/block} + {/block} +
+{/block} diff --git a/frontend/index/main-navigation.tpl b/frontend/index/main-navigation.tpl index e9985aa..4771a4f 100644 --- a/frontend/index/main-navigation.tpl +++ b/frontend/index/main-navigation.tpl @@ -7,8 +7,6 @@