antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Marion Muszynski 2016-06-22 16:11:15 +02:00
commit f3fdc49173
3 changed files with 135 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adm/tabs/AdminProducts.php
View File

@ -30,7 +30,6 @@ class AdminProducts extends AdminTab
{
protected $maxImageSize = NULL;
protected $maxFileSize = NULL;
private $_category;
public function __construct()
@ -4388,5 +4387,4 @@ class AdminProducts extends AdminTab
break;
}
}
}

92
themes/site/css/style.css
View File

@ -5815,6 +5815,87 @@ div#giftvoucher_ask_infos_block .gv_customization > .gv_param input {
font-size: 13px;
}
h3.carrier_title{
margin-bottom: 10px;
}
table#carrierTable tbody td {
color: #444d52;
font-size: 12px;
border-bottom: 0px;
border-top: 10px solid #f1f1f1;
background: #FFF;
line-height: 1.5em;
padding: 5px 10px;
}
#carrierTable thead {
background-color: #514c8c;
}
#carrierTable thead tr th{
color: #fff;
}
.soflexibiliteStar{
color: #e26ea2!important;
}
#adresseFinal .so-prez-libelle{
color: #514c8c!important;
}
#custMail, #sl_phone {
min-height: 20px!important;
font-size: 14px!important;
}
#soflexibilite_speech{
display: none!important
}
/******** Address autocomplete **********/
#address_ac {
z-index: 5;
background: #FFF;
border-left: 1px solid #e4e4e4;
border-right: 1px solid #e4e4e4;
border-bottom: 1px solid #e4e4e4;
margin: 1px 0px 0px 0px;
min-width: 278px;
-moz-box-shadow: 2px 10px 10px -8px rgba(0, 0, 0, .5);
-webkit-box-shadow: 2px 10px 10px -8px rgba(0, 0, 0, .5);
-ms-box-shadow: 2px 10px 10px -8px rgba(0, 0, 0, .5);
-o-box-shadow: 2px 10px 10px -8px rgba(0, 0, 0, .5);
box-shadow: 2px 10px 10px -8px rgba(0, 0, 0, .5));
list-style: outside none;
overflow: auto;
max-height: 300px;
}
#address_ac li {
font-size: 12px;
line-height: 1.4em;
padding: 5px 20px 5px 10px;
cursor: pointer;
}
#address_ac li:hover {
background: #EEE;
}
#address_ac strong {
padding: 0px 1px;
}
.paypal_account {
background: #fff none repeat scroll 0 0;
border: 1px solid #ccc;
margin: 10px 0 5px;
padding: 15px;
overflow: auto;
}
.paypal_account input[type="radio"] {
float: left;
margin-right: 7px;
position: relative;
top: 3px;
}
.paypal_account label {
float: left;
}
/** Module loyalty **/
#module-loyalty-loyalty-program #block-history{
background: #fff;
@ -5910,6 +5991,12 @@ div#giftvoucher_ask_infos_block .gv_customization > .gv_param input {
display: block;
}
#loyalty_cart{
background: url("../img/fidelite.png") no-repeat left center;
}
#header_nav .inner a.submenu_top_btn.credit {
background: url('../img/picto_account.png') no-repeat 75px 11px #fff;
}
/** New product tpl **/
#product #primary_block{
margin-top: 20px;
@ -6315,7 +6402,7 @@ div#giftvoucher_ask_infos_block .gv_customization > .gv_param input {
display: block;
display: -webkit-box;
max-width: 110px;
height: 41px;
height: 44px;
margin: 0 auto;
font-size: 12px;
line-height: 15px;
@ -6332,7 +6419,8 @@ div#giftvoucher_ask_infos_block .gv_customization > .gv_param input {
#product #best-sellers_block_product .slider_sales_product_footer .slides li .info_sellers p.price{
border:0;
color: #FB69AA;
font-size: 16px;
font-size: 16px;
padding-top: 18px;
}
#product #best-sellers_block_product .slider_sales_product_footer .slides li .info_sellers .old_price {
color: #B0B0B0;

45
themes/site_mobile/css/style.css
View File

@ -4772,3 +4772,48 @@ h4.subtitle {
font-style: italic;
font-size: 13px;
}
#product #more_info_tabs {
background: #FFF;
}
#product .idTabs {
margin: 0px;
list-style: none outside;
overflow: auto;
}
.block_hidden_only_for_screen {
display: none;
}
#product #more_info_block .idTabs li {
position: relative;
margin-left: 1px;
line-height: 12px;
}
#product #more_info_block .idTabs li a {
background: #fb66a9;
color: #fff;
display: block;
text-decoration: none;
padding: 20px 15px;
font-size: 17px;
text-align: center;
}
#product #more_info_block .idTabs li a.selected {
font-weight: bold;
background: #F3F3F3;
color: #fb66a9;
}
body#product #primary_block #more_info_block .sheets ul li,
body#product #primary_block #more_info_block .sheets p {
margin-bottom: 5px;
text-align: justify;
line-height: 16px;
}
body#product .flex-control-nav.flex-control-paging{
display: none;
}
body#product #best-sellers_block_product{
display: none;
}