// fix table manufacturer, change place login preference header, fix menu navigation

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11992 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 14:05:44 +00:00
parent 1c8d3283a1
commit 30aa671a5d
7 changed files with 19 additions and 17 deletions
@@ -1,6 +1,4 @@
-<<<<<<< .mine
 <tr id="new_product" height="52" style="display:none;background-color:#e9f1f6;">
-=======
 {*
 * 2007-2011 PrestaShop
 *
@@ -514,7 +514,7 @@
 				{/if}
 				<table style="width: 100%;" cellspacing="0" cellpadding="0" class="table" id="orderProducts">
 					<tr>
-						<th align="center" style="width: 7%">&nbsp;</th>
+						<th height="39" align="center" style="width: 7%">&nbsp;</th>
 						<th>{l s='Product'}</th>
 						<th style="width: 15%; text-align: center">{l s='UP'} <sup>*</sup></th>
 						<th style="width: 4%; text-align: center">{l s='Qty'}</th>