Merge branch 'ticket-14904-achatexpressmobile' into develop

This commit is contained in:
Michael RICOIS 2017-12-08 16:04:25 +01:00
commit 1494653b77

View File

@ -20,14 +20,14 @@
<style type="text/css">{literal} <style type="text/css">{literal}
h1 { h1 {
text-align: left; text-align: left;
line-height: 1em; padding:0;
width : 190px; line-height: 20px;
color : #1E1633; text-shadow:0px 0px 0px transparent;
font-style: italic; font-family: 'Montserrat-Regular';
font-family: Georgia, Times, "Times New Roman", serif; font-size:12px;
font-weight: normal; font-weight:normal;
min-height : 2em; font-style: normal;
font-size : 18px; color:#333;
} }
p { p {
margin: 0px; margin: 0px;
@ -35,8 +35,8 @@
} }
.center_element { .center_element {
margin : 20px 0; margin : 20px 0;
padding : 10px 20px 5px 10px; padding : 5px 5px 5px 5px;
width : 220px; /*width : 220px;*/
/*background : #DEA4BE;*/ /*background : #DEA4BE;*/
background : #fb66a9; background : #fb66a9;
float : left; float : left;
@ -55,6 +55,7 @@
text-align: right; text-align: right;
} }
input[type="text"] { input[type="text"] {
height: 24px;
font-size: 12px; font-size: 12px;
color: #8B8B8B; color: #8B8B8B;
padding: 4px; padding: 4px;
@ -66,6 +67,7 @@
-ms-border-radius : 2px; -ms-border-radius : 2px;
} }
select { select {
height: 24px;
font-size: 12px; font-size: 12px;
color: #8B8B8B; color: #8B8B8B;
padding: 4px; padding: 4px;
@ -149,7 +151,7 @@
font-size: 13px; font-size: 13px;
font-style: italic; font-style: italic;
color: #ffffff; color: #ffffff;
margin: 20px 0 0; margin: 10px 0 0;
padding: 7px 30px 6px 20px; padding: 7px 30px 6px 20px;
-moz-border-radius: 20px; -moz-border-radius: 20px;
-webkit-border-radius: 20px; -webkit-border-radius: 20px;
@ -399,8 +401,9 @@
</p> </p>
<h1>{$product->name}</h1> <h1>{$product->name}</h1>
<div class="border-separator"></div> <div class="border-separator"></div>
<div class="border-separator"></div>
<div class="center_element"> <div class="center_element">
{assign var=id_image value=Product::getCover($product->id)}
<img src="{$link->getImageLink($product->link_rewrite, $product->id|cat:'-'|cat:$id_image.id_image, 'small')}" alt="{$product->name|escape:'htmlall':'UTF-8'}" />
<div class="right_element"> <div class="right_element">
{if isset($groups)} {if isset($groups)}
<!-- attributes --> <!-- attributes -->
@ -440,7 +443,6 @@
</div> </div>
<div style="clear: both;"></div> <div style="clear: both;"></div>
<div class="border-separator"></div>
<div class="border-separator"></div> <div class="border-separator"></div>
<p id="add_to_cart" class="button"><input type="submit" name="Submit" value="{l s='Add to cart' mod='expresscart'}" class="exclusive" /> <p id="add_to_cart" class="button"><input type="submit" name="Submit" value="{l s='Add to cart' mod='expresscart'}" class="exclusive" />