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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source 
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
This commit is contained in:
Kevin Granger
2013-09-13 11:41:14 +02:00
parent ce74aeb357 db4b69d10c
commit c7ec33f062
247 changed files with 7965 additions and 4936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/admin.css
+2062 -1
View File
File diff suppressed because one or more lines are too long
css/admin.scss
+9 -3
View File
@@ -1,4 +1,4 @@
#nobootstrap {
#nobootstrap{
/* CSS Admin PrestaShop */
* {font-family: Arial,Verdana,Helvetica,sans-serif}
@@ -2471,14 +2471,20 @@
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;
@@ -2636,10 +2642,10 @@
#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) {