Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/versionecologique.git

This commit is contained in:
Michael RICOIS 2017-07-13 15:01:10 +02:00
commit bc56b27778
6 changed files with 93 additions and 124 deletions

View File

@ -12,10 +12,10 @@
<div class="favorites-list-tabs">
<div class="ctn">
<input id="favoritesTab" type="radio" name="favorites-list-tabs" checked>
<label for="favoritesTab">{l s="Coups de coeur {$category->name}"}</label>
<label for="favoritesTab">{l s="Coups de coeur "}<span class="hidden-xxs hidden-xs hidden-sm">{$category->name}</span></label>
<input id="newsTab" type="radio" name="favorites-list-tabs">
<label for="newsTab">{l s="Nouveautés {$category->name}"}</label>
<label for="newsTab">{l s="Nouveautés "}<span class="hidden-xxs hidden-xs hidden-sm">{$category->name}</span></label>
<div class="content-items">
<div id="content-favorites">
<div class="products-list">

View File

@ -41,6 +41,10 @@ body.content_only { margin: 0 }
background: rgba(106, 195, 127, 0.2);
}
@media(min-width:992px) {
.ac_results {display:none !important;}
}
/*************************************************************************************************************/
/**************************************** ++ GLOBAL ++ *************************************/
/**************************************************************************************************************/
@ -190,6 +194,8 @@ body.content_only { margin: 0 }
#header #mainmenu:hover .menu-icon { color:#5986d5; }
#header #mainmenu:hover .block-mainmenu { display:block; }
#header #mainmenu li:hover .main-submenu { display:block; }
#header #mainmenu .main-submenu .backButton { display:none; }
#header #mainmenu .main-submenu .main-submenu-img {
height:200px;
position: relative;
@ -224,6 +230,7 @@ body.content_only { margin: 0 }
margin-left:3px;
}
#header #mainmenu .main-submenu .main-submenu-infos .submenu-infos-link { margin-top:30px;}
#header #mainmenu .main-submenu .main-submenu-infos .submenu-infos-link li { display:block !important;}
#header #mainmenu .main-submenu .main-submenu-infos .submenu-infos-link p {
font-family: "RubikRegular";
font-size: 15px;
@ -355,10 +362,10 @@ body.content_only { margin: 0 }
padding: 30px 15px;
}
#header #mainmenu .menu-content > li ul {
height: 190px
/*height: 190px;*/
}
#header #mainmenu .menu-content > li ul li {
display: block;
display: inline-block;
letter-spacing: 0;
transition: all 0.3s ease 0s;
-moz-transition: all 0.3s ease 0s;
@ -378,20 +385,6 @@ body.content_only { margin: 0 }
text-transform: none;
}
#header #mainmenu .menu-content > li ul li:hover a { color: #b5985b }
#header #mainmenu .menu-content > li ul li a i {
color: #fff;
font-size: 15px;
font-weight: normal;
height: 14px;
line-height: 14px;
margin-top: -6px;
position: absolute;
right: 0;
text-align: center;
top: 50%;
width: 14px;
}
#header #mainmenu .menu-content > li ul li:hover a i { color: #e44e58; right: 10px; }
#header #mainmenu .menu-content > li ul li a i:before { display: inline }
#header #mainmenu .menu-content > li .see-more {
color: #b5985b;
@ -453,33 +446,53 @@ body.content_only { margin: 0 }
#header #mainmenu > div > ul { background: #fff; height: 100%; left: -101%; margin: 0; position: absolute; transition: all 0.3s ease 0s; width: 100% }
#header #mainmenu.open > div > ul { left: 0; overflow-y: auto; }
#header #mainmenu li { padding: 0 30px 0 50px; width: 100% }
#header #mainmenu > div > ul.menu-content > li.close-tab { background: #363842; font-weight: 900; text-transform: uppercase; margin-bottom: 25px; }
#header #mainmenu > div > ul.menu-content > li.close-tab a { font-size: 12px; padding: 27px 0; }
#header #mainmenu > div > ul.menu-content .close-tab { background: #363842; font-weight: 900; text-transform: uppercase; margin-bottom: 25px; }
#header #mainmenu > div > ul.menu-content .close-tab a { font-size: 12px; padding: 27px 0; }
#header #mainmenu > div > ul.menu-content > li > a,
#header #mainmenu > div > ul.menu-content > li > span { color: #333; display: block; font-size: 14px; padding: 15px 0; position: relative; width: 100%; text-decoration: none; }
#header #mainmenu > div > ul.menu-content > li > span { color: #333; display: block; font-family:"RubikRegular"; font-size: 14px; padding: 15px 0; position: relative; width: 100%; text-decoration: none; }
#header #mainmenu > div > ul.menu-content > li > a:hover { text-decoration: none }
#header #mainmenu > div > ul.menu-content > li.close-tab > a { border: 0; color: #fff; text-transform: none; text-decoration: none; }
#header #mainmenu > div > ul.menu-content > li.close-tab > a i.icon-cross {float:left; font-size: 17px; margin-top: -4px; margin-left: -32px; }
#header #mainmenu > div > ul.menu-content .close-tab > a { border: 0; color: #fff; text-transform: none; text-decoration: none; }
#header #mainmenu > div > ul.menu-content .close-tab > a i.icon-cross {float:left; font-size: 17px; margin-top: -4px; margin-left: -32px; }
#header #mainmenu > div > ul.menu-content > .search-on-menu { position: absolute; top: 5px; right: 11px; font-size: 25px; padding: 15px; color: #fff; }
#header #mainmenu > div > ul > li > .main-submenu { background: #fff; height: 100%; left: -101%; margin: 0; overflow-y: auto; position: fixed; top: 0; transition: all 0.3s ease 0s; width: 50%; z-index: 2 }
#header #mainmenu > div > ul > li > .main-submenu { background: #fff; height: 100%; top:35px; left: -101%; margin: 0; overflow-y: auto; position: fixed; transition: all 0.3s ease 0s; width: 50%; z-index: 2 }
#header #mainmenu > div > ul > li.open > .main-submenu { font-size: 14px; left: 0; overflow-x: hidden }
#header #mainmenu .menu-content > li .main-submenu .column { padding: 0 45px }
#header #mainmenu > div > ul > li > * + .main-submenu .ctn { padding: 0; width: 100% }
#header #mainmenu > div > ul > li > * + .main-submenu .close-tab { background: #363842; text-transform: uppercase; }
#header #mainmenu > div > ul > li > * + .main-submenu .close-tab a { color: #fff; display: block; font-size: 18px; font-weight: 900; padding: 15px 30px; text-decoration: none; text-transform: uppercase; }
#header #mainmenu > div > ul > li > * + .main-submenu .close-tab a i { float: left; font-size: 26px;margin-top: -3px }
#header #mainmenu > div > ul > li > * + .main-submenu .close-tab { padding: 0 30px 0 50px; width:100%;}
#header #mainmenu > div > ul > li > * + .main-submenu .close-tab a {display: block;}
#header #mainmenu > div > ul > li > * + .main-submenu .main-submenu-infos { margin-bottom:50px; }
#header #mainmenu > div > ul > li > * + .main-submenu .main-submenu-infos .title { display:block; font-size:18px; font-family:"RubikMedium"; padding: 10px 30px 15px 50px; width: 100%; }
#header #mainmenu > div > ul > li > * + .main-submenu .main-submenu-infos li { padding: 0 30px 0 50px; width: 100%;}
#header #mainmenu > div > ul > li > * + .main-submenu .menu-subtitle { border: 0; color: #363842; display: block; font-size: 16px; font-weight: 900; padding: 30px 0 0 0; text-transform: uppercase; }
#header #mainmenu > div > ul > li > * + .main-submenu .cta-menu { display: none; }
#header #mainmenu > div > ul > li > a.open { background: #b4293c; text-decoration: none; }
#header #mainmenu > div > ul > li > a.open + .main-submenu { max-height: 500px; overflow: hidden }
#header #mainmenu > div > ul > li li a { display: block; padding: 15px 0 5px 50px }
#header #mainmenu > div > ul > li li a i { display: none }
/*#header #mainmenu > div > ul > li li a i { display: none; }*/
#header #mainmenu li ul li div { display: none }
header #mainmenu > div > ul > li > * + .main-submenu .see-more { background: #121212; font-weight: 900; padding: 15px 30px; text-transform: uppercase;}
header #mainmenu > div > ul > li > * + .main-submenu .see-more a { color: #fff }
#header #mainmenu .menu-content .main-submenu li { padding: 0; }
#header #mainmenu .menu-content .main-submenu li a { border-bottom: 1px solid #f1f1f1; color: #333; font-size: 14px; padding: 15px 0; text-transform: none }
#header #mainmenu .menu-content .main-submenu li a {
color: #333;
font-family: "RubikRegular";
font-size: 14px;
padding: 10px 0;
text-decoration:none;
text-transform: none
}
#header #mainmenu .menu-content .main-submenu .submenu-infos-link a {
border: 2px solid #f73746;
border-radius:50px;
color: #f73746;
font-family: "RubikMedium";
font-size: 14px;
padding: 12px 0;
max-width:230px;
text-align: center;
margin-top:15px;
}
#header #mainmenu .menu-content .infos-menu {
padding-top: 30px;
border-top: 1px solid #000;
@ -506,6 +519,7 @@ body.content_only { margin: 0 }
#header #mainmenu .menu-content .infos-menu [class^="icon"] { font-size: 35px; }
#header #mainmenu .menu-content .infos-menu [class^="icon"]:before { color:#715bf4; }
#header .header-right {
/*width:100%;*/
}
@ -602,22 +616,17 @@ body.content_only { margin: 0 }
}
@media (min-width: 768px) and (max-width: 991px) {
#header #search_block_left.showMe #search_query_block {
text-align: center;
}
#header #search_block_left.showMe #search_query_block { text-align: center; }
}
@media (max-width: 767px) {
/*#header #mainmenu > div > ul, #header #mainmenu > div > ul > li > .submenu { width: 80% }*/
#header #mainmenu { width: 90% }
#header #mainmenu > div > ul.menu-content > li > a,
#header #mainmenu > div > ul.menu-content > li > span { padding:10px 0; }
#header #mainmenu > div > ul.menu-content > li > span { padding:10px 0; }
#header #mainmenu > div > ul > li > .main-submenu { width: 90% }
}
@media (max-width: 480px) {
#header {
background-size: 100% 23px;
height: 80px;
}
#header { background-size: 100% 23px; height: 80px }
#header #header_logo { height:80px; }
#header .ctn #header_logo a { top:35px;}
#header .logo { width:130px; }
@ -626,9 +635,7 @@ body.content_only { margin: 0 }
#header #search_block_left #search_button .icon-search { font-size: 20px;}
#header #header-cart { top:38px;}
#header #header-cart .my-cart span:last-child {
padding: 7px 10px 7px 9px;
}
#header #header-cart .my-cart span:last-child { padding: 7px 10px 7px 9px;}
#header .header-right .contact-us { top: 3px; }
#header .header-right .contact-us * { font-size:11px !important; }
@ -637,22 +644,10 @@ body.content_only { margin: 0 }
#mainmenu > ul > li > a { padding: 15px 70px 15px 20px; }
#slider-home {
top:80px;
}
#header #search_block_left #search_query_block {
padding: 15px 40px 15px 15px;
top:80px;
}
#header #search_block_left #search_button {
right: 45px;
top: 45px;
}
#header #search_block_left .closeBtn {
font-size:17px;
right: 66px;
top: 43px;
}
#slider-home {top:80px; }
#header #search_block_left #search_query_block {padding: 15px 40px 15px 15px;top:80px;}
#header #search_block_left #search_button { right: 45px;top: 45px;}
#header #search_block_left .closeBtn {font-size:17px;right: 66px;top: 43px; }
#header #search_block_left.showMe .closeBtn:after {
bottom:-25px;
right:4px;
@ -669,9 +664,10 @@ body.content_only { margin: 0 }
font-size: 14px;
}
#header #mainmenu { top: 23px; }
#header #mainmenu > div > ul.menu-content > li.close-tab > a,
#header #mainmenu > div > ul.menu-content > li.close-tab > span { padding:23px 0;}
#header #mainmenu,
#header .main-submenu { top: 23px !important; }
#header #mainmenu > div > ul.menu-content .close-tab > a,
#header #mainmenu > div > ul.menu-content .close-tab > span { padding:23px 0; font-family:"RubikMedium";}
#header #mainmenu > div > ul.menu-content > .search-on-menu { font-size: 20px; right:7px; top:4px; padding: 15px; }
}
@ -1046,9 +1042,7 @@ body.content_only { margin: 0 }
height:634px;
}
#slider-home #slider img {
float: none;
position: relative;
right: -280px;
}
#slider-home .slider .homeslider-ctn .homeslider-description-block {
width: 26%;
@ -5117,6 +5111,18 @@ form.std {
@media (max-width: 480px) {
#contact .bloc-contact { padding:30px 15px;}
}
/*************************************************************************************************************
**************************************** == SEARCH == ***************************************
**************************************************************************************************************/
#search {}
#search section { background:url(../img/background-motif-2.png) left top repeat; padding:60px 0;}
/*************************************************************************************************************
**************************************** == COOKIE == ***************************************
**************************************************************************************************************/

View File

@ -26,30 +26,32 @@
{/if}
{if !empty($rootLink.category)}
<div class="main-submenu">
<div class="close-tab">
<div class="close-tab backButton">
<a href="#">
<span>{l s='Retour' mod='advmenu'}</span>
<i class="icon icon-cross"></i>
</a>
</div>
<div class="main-submenu-img">
<div class="hidden-xxs hidden-xs hidden-sm main-submenu-img">
<img src="{$base_dir}img/c/home/{$rootLink.id_category}.jpg" alt="" />
</div>
<div class="main-submenu-infos">
<h2>{$rootLink.category->name}</h2>
<span class="title">{$rootLink.category->name}</span>
{if !empty($rootLink.subcategories)}
<div class="submenu-infos-list">
<ul class="submenu-infos-list">
{foreach from=$rootLink.subcategories item=subcategory name=subcategory key=k}
<a href="{$link->getCategoryLink($subcategory.id_category)}">{$subcategory.name}{if ($k + 1) < $rootLink.subcategories|@count},{/if}</a>
<li><a href="{$link->getCategoryLink($subcategory.id_category)}">{$subcategory.name}{if ($k + 1) < $rootLink.subcategories|@count},{/if}</a></li>
{/foreach}
</div>
</ul>
{/if}
<div class="submenu-infos-link">
<a href="{$link->getCategoryLink($rootLink.id_category)}">
{l s='Découvrir les coups de '}
<i class="icon-heart-full"></i>
</a>
</div>
<ul class="submenu-infos-link">
<li>
<a href="{$link->getCategoryLink($rootLink.id_category)}">
{l s='Découvrir les coups de '}
<i class="icon-heart-full"></i>
</a>
</li>
</ul>
</div>
</div>
<div class="overlay-submenu"></div>

View File

@ -8,7 +8,7 @@
<a href="{$slide.url}">
{/if}
<img src="{$base_dir}img/slider/{$slide.id_slide}.jpg" width="100%" height="100%" alt="{$slide.title|escape:'htmlall':'UTF-8'}" />
<div class="homeslider-description ctn">
<div class="homeslider-description">
<div class="homeslider-description-block">
{if !empty($slide.title)}
<p class="homeslider-title">
@ -55,18 +55,7 @@
// navText: ['<i class="icon icon-arrow-left"></i>','<i class="icon icon-arrow-right"></i>'],
autoplay: false,
margin: 15,
items:1,
responsive : {
0 : {
autoWidth:false
},
480 : {
autoWidth:false
},
768 : {
autoWidth:true
}
}
items:1
});
});
</script>

View File

@ -44,7 +44,7 @@
{assign var=imageTitle value=$product->name|escape:'html':'UTF-8'}
{/if}
<li id="large_{$image.id_image}">
<img class="img-responsive" id="lg_{$image.id_image}" src="{$link->getImageLink($product->link_rewrite, $imageIds, 'thickbox_default')|escape:'html':'UTF-8'}" alt="{$imageTitle}" title="{$imageTitle}"{if isset($cartSize)} height="{$cartSize.height}" width="{$cartSize.width}"{/if} itemprop="image" />
<img class="img-responsive" id="lg_{$image.id_image}" src="{$link->getImageLink($product->link_rewrite, $imageIds, 'large_default')|escape:'html':'UTF-8'}" alt="{$imageTitle}" title="{$imageTitle}"{if isset($cartSize)} height="{$cartSize.height}" width="{$cartSize.width}"{/if} itemprop="image" />
</li>
{/foreach}
{/if}

View File

@ -20,47 +20,19 @@
<main>
<section>
{include file="$tpl_dir./page-heading.tpl" title=$smarty.capture.title type='block'}
<div class="ctn">
<div class="row">
<aside class="filters md3">
<div class="inner block">
<span class="title">{l s='Catégories'}<i class="icon icon-cross hidden-lg hidden-md"></i></span>
<div class="content">
{if !empty($categoriesTree.children)}
<ul class="tree animated-full">
{foreach from=$categoriesTree.children item=children key=key}
<li>
<a title="{$children.name}" href="{$children.link}">
{$children.name}
<i class="icon icon-arrow-right"></i>
</a>
</li>
{/foreach}
</ul>
{/if}
<div class="block">
{if $search_products}
<div class="products-list">
<div class="clearfix">
{include file="./product-list.tpl" products=$search_products nbProduct=3}
</div>
</div>
</aside>
<div class="md9 block">
<a href="#" class="switch-category hidden-lg hidden-md"><i class="icon icon-filter"></i>{l s='Changer de catégorie'}</a>
{if $search_products}
<div class="products-list">
<div class="clearfix">
{include file="./product-list-line.tpl" products=$search_products nbProduct=3}
</div>
</div>
<div>
{include file="./pagination.tpl" paginationId='bottom'}
</div>
{/if}
</div>
<div>
{include file="./pagination.tpl" paginationId='bottom'}
</div>
{/if}
</div>
</div>
</section>