fix css conflicts

This commit is contained in:
Marion Muszynski 2016-08-23 12:31:28 +02:00
commit e02097858b
9 changed files with 171 additions and 33 deletions

View File

@ -3008,11 +3008,36 @@ div.addresses ul.address li.address_title {
display: none;
z-index: 2;
}
#product .info_coeur p{
#product .info_coeur p{
color: #666666;
font-size: 13px;
text-align: justify;
}
#product .help_tailles {
background: url('../img/aide-contact.png') no-repeat left center;
width: 25px;
display:inline-block;
}
#product .info_tailles{
background: url("../img/bg_help_size_bottom.png") no-repeat;
height: 120px;
left: 94px;
padding: 25px 40px;
position: absolute;
top: -170px;
width: 190px;
display: none;
z-index: 2;
}
#product .info_tailles p{
color: #666666;
font-size: 13px;
text-align: justify;
}
#product #views_block ul {
margin: 0px;
list-style: none outside;
@ -6038,6 +6063,7 @@ table#carrierTable tbody td {
cursor: pointer;
z-index: 2;
}
#product #views_block {
border: none;
border-top: 0;

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

@ -561,4 +561,13 @@ $( document ).ready(function() {
}, function(){
$('#loyalty .desc').stop(true, true).fadeOut();
});
});
});
$( document ).ready(function() {
$('.tailles').hover(function() {
$('.info_tailles').stop(true, true).fadeIn();
}, function(){
$('.info_tailles').stop(true, true).fadeOut();
});
});

View File

@ -314,18 +314,39 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
{if isset($groups)}
<!-- attributes -->
<div id="attributes">
{foreach from=$groups key=id_attribute_group item=group}
{if $group.attributes|@count}
<p>
<label for="group_{$id_attribute_group|intval}">{$group.name|escape:'htmlall':'UTF-8'} :</label>
{assign var="groupName" value="group_$id_attribute_group"}
<select name="{$groupName}" id="group_{$id_attribute_group|intval}" onchange="javascript:findCombination();">
{foreach from=$group.attributes key=id_attribute item=group_attribute}
<option value="{$id_attribute|intval}"{if (isset($smarty.get.$groupName) && $smarty.get.$groupName|intval == $id_attribute) || $group.default == $id_attribute} selected="selected"{/if} title="{$group_attribute|escape:'htmlall':'UTF-8'}">{$group_attribute|escape:'htmlall':'UTF-8'}</option>
{/foreach}
</select>
</p>
{/if}
{if $group.attributes|@count}
<p>
<label for="group_{$id_attribute_group|intval}">{$group.name|escape:'htmlall':'UTF-8'}
{if $id_attribute_group == '1' ||
$id_attribute_group == '5'}
<span class="help_tailles tailles">&nbsp;</span>
{/if}
:
</label>
{if $id_attribute_group == '1' || $id_attribute_group == '5'}
<div class="info_tailles" style="display:none">
<p>
{l s='La taille affichée correspond au standard français. Elle peut différer de la taille inscrite sur l\'emballage du produit.'}
</p>
</div>
{/if}
{assign var="groupName" value="group_$id_attribute_group"}
<select name="{$groupName}" id="group_{$id_attribute_group|intval}" onchange="javascript:findCombination();"
>
{foreach from=$group.attributes key=id_attribute item=group_attribute}
<option value="{$id_attribute|intval}"{if (isset($smarty.get.$groupName) && $smarty.get.$groupName|intval == $id_attribute) || $group.default == $id_attribute} selected="selected"{/if} title="{$group_attribute|escape:'htmlall':'UTF-8'}">{$group_attribute|escape:'htmlall':'UTF-8'}</option>
{/foreach}
</select>
</p>
{/if}
{/foreach}
</div>
{/if}

View File

@ -3878,7 +3878,8 @@ body#index .jqibuttons span.gradient{
cursor: pointer;
display: none;
}
.box_add_to_cart{
.box_add_to_cart,
.box_info_size {
display: none;
box-shadow: 2px 2px 5px 0px rgba(0, 0, 0, 0.1);
position: fixed;
@ -3891,13 +3892,15 @@ body#index .jqibuttons span.gradient{
margin-left: -150px;
padding: 20px;
}
.box_add_to_cart .close{
.box_add_to_cart .close,
.box_info_size .close {
position: absolute;
right: 26px;
top: 26px;
cursor: pointer;
}
.box_add_to_cart .content{
.box_add_to_cart .content,
.box_info_size .content {
background: #fff;
padding: 15px;
}
@ -3944,7 +3947,7 @@ body#index .jqibuttons span.gradient{
font-size: 20px;
color: #e36ea2;
}
.box_add_to_cart .content .others_links{
.box_add_to_cart .content .others_links {
border-top: 1px solid #ccc;
padding-top: 15px;
clear: both;
@ -3984,10 +3987,12 @@ body#index .jqibuttons span.gradient{
display: block;
display: block;
}
.box_add_to_cart .content .others_links .show_fdp_info{
.box_add_to_cart .content .others_links .show_fdp_info,
.box_info_size .content .innerbox_info .show_size_info {
font-size: 11px; padding-top: 10px
}
.box_add_to_cart .content .others_links .show_cart{
.box_add_to_cart .content .others_links .show_cart {
display: block;
clear: both;
color: #FFF;
@ -4006,7 +4011,7 @@ body#index .jqibuttons span.gradient{
background-size: 10%;
}
.box_add_to_cart .content_best_sales{
.box_add_to_cart .content_best_sales {
display: none;
overflow: auto;
background: #eaeaea;
@ -4894,7 +4899,8 @@ body#product #best-sellers_block_product{
background: url("../img/cart.png") no-repeat left 12px center #504D8B;
background-size: 10%;
}
.box_add_to_cart .content .others_links .show_fdp_info {
.box_add_to_cart .content .others_links .show_fdp_info,
.box_info_size .content .innerbox_info .show_info_size {
text-align: center;
font-size: 13px;
}
@ -4914,4 +4920,38 @@ body#product #best-sellers_block_product{
.productQuantityAlert p{
color: white;
font-size: 14px;
}
}
.box_info_size .content .innerbox_info .show_info_size {
padding-top : 25px;
}
#product .help_tailles {
background: url('../img/aide-contact.png') no-repeat left center;
width: 25px;
display:inline-block;
}
/*
#product .info_tailles {
background: url("../img/bg_help_size_bottom.png") no-repeat;
height: 170px;
padding: 25px 40px;
position: absolute;
top: 248px;
z-index: 2;
}
@media screen and (min-width: 400px) {
#product .info_tailles {
left:25%;
top: 205px;
}
}
#product .info_tailles p {
color: #666666;
font-size: 13px;
text-align: justify;
width: 200px;
}
*/

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

@ -501,6 +501,24 @@ $(document).ready(function()
'transitionOut' : 'elastic'
});
}
$('.tailles').click(function(e) {
$('.box_info_size').css({
'position' : 'fixed',
'top' : '50%',
'margin-top': -$('.box_info_size').outerHeight()/2
});
$('.info_tailles').stop(true, true).fadeIn();
});
var closeInfoSize = function() {
$('.overlay_bbb').fadeOut();
$('.box_info_size').fadeOut();
}
$('.box_info_size .close').click(closeInfoSize);
$('.overlay_bbb').click(closeInfoSize);
});
function saveCustomization()

View File

@ -308,17 +308,41 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
<!-- attributes -->
<div id="attributes">
{foreach from=$groups key=id_attribute_group item=group}
{if $group.attributes|@count}
<p>
<label for="group_{$id_attribute_group|intval}">{$group.name|escape:'htmlall':'UTF-8'} :</label>
{assign var="groupName" value="group_$id_attribute_group"}
<select name="{$groupName}" id="group_{$id_attribute_group|intval}" onchange="javascript:findCombination();{if $colors|@count > 0}$('#wrapResetImages').show('slow');{/if};">
{foreach from=$group.attributes key=id_attribute item=group_attribute}
<option value="{$id_attribute|intval}"{if (isset($smarty.get.$groupName) && $smarty.get.$groupName|intval == $id_attribute) || $group.default == $id_attribute} selected="selected"{/if} title="{$group_attribute|escape:'htmlall':'UTF-8'}">{$group_attribute|escape:'htmlall':'UTF-8'}</option>
{/foreach}
</select>
</p>
{/if}
{if $group.attributes|@count}
<p>
<label for="group_{$id_attribute_group|intval}">{$group.name|escape:'htmlall':'UTF-8'}
{if $id_attribute_group == '1' ||
$id_attribute_group == '5'}
<span class="help_tailles tailles">&nbsp;</span>
{/if}
:</label>
{if $id_attribute_group == '1' || $id_attribute_group == '5'}
<div class="info_tailles overlay_bbb" style="display:none"></div>
<div class="info_tailles box_info_size" style="display:none">
<div class="content">
<div class="close" id="close_add_to_cart">
<img src="{$img_dir}/close.jpg" alt="{l s='Fermer la fenètre'}">
</div>
<div class="innerbox_info">
<p class="show_info_size">
{l s='La talla indicada corresponde a los estándares españoles. En ocasiones, puede ser diferente de la talla que aparezca en el envoltorio del producto (talla europea).'}
</p>
</div>
</div>
</div>
{/if}
{assign var="groupName" value="group_$id_attribute_group"}
<select name="{$groupName}" id="group_{$id_attribute_group|intval}" onchange="javascript:findCombination();{if $colors|@count > 0}$('#wrapResetImages').show('slow');{/if};">
{foreach from=$group.attributes key=id_attribute item=group_attribute}
<option value="{$id_attribute|intval}"{if (isset($smarty.get.$groupName) && $smarty.get.$groupName|intval == $id_attribute) || $group.default == $id_attribute} selected="selected"{/if} title="{$group_attribute|escape:'htmlall':'UTF-8'}">{$group_attribute|escape:'htmlall':'UTF-8'}</option>
{/foreach}
</select>
</p>
{/if}
{/foreach}
</div>
{/if}