dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

//MERGE branche release

Browse Source
This commit is contained in:
Vincent Augagneur
2013-08-26 10:59:36 +02:00
parent bc071f2b04 08dadb7fd3
commit ad428dfb2b
161 changed files with 2530 additions and 1173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/admin.css
+8 -2
View File
@@ -2470,14 +2470,20 @@ margin-bottom:7px;
clear: both;
width: 100%;
}
#carrier_wizard.swMain ul.anchor li{
position: relative;
display:block;
margin: 0;
padding: 0;
float: left;
}
#carrier_wizard.swMain ul.nbr_steps_4.anchor li{
width: 25%;
}
#carrier_wizard.swMain ul.nbr_steps_5.anchor li{
width: 20%;
}
#carrier_wizard.swMain ul.anchor li a {
height: 32px;
display:block;
@@ -2635,10 +2641,10 @@ margin-bottom:7px;
#carrier_wizard #zone_ranges label { float: none; width: inherit }
#carrier_wizard #step_carrier_summary label {width: 40px}
#carrier_wizard #step_carrier_summary .margin-form {padding-left: 60px;}
#carrier_wizard #summary_zones, #carrier_wizard #summary_groups {margin-left: 20px; margin-top: 10px; list-style: disc}
#carrier_wizard #summary_zones, #carrier_wizard #summary_groups, #carrier_wizard #summary_shops {margin-left: 20px; margin-top: 10px; list-style: disc}
#carrier_wizard .ranges_not_follow label {width: inherit; float:none}
#carrier_wizard .ranges_not_follow {width: 300px; margin-bottom: 0}
#carrier_wizard .assoShop { min-height: inherit}
/*** IE10 ***/
/*@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {