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

// fix admin return and min-height new installer

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11819 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vKham
2011-12-28 09:27:56 +00:00
parent bc3261e0b7
commit f35fded601
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminReturnController.php
+2 -2
View File
@@ -38,9 +38,9 @@ class AdminReturnControllerCore extends AdminController
$this->fieldsDisplay = array( $this->fieldsDisplay = array(
'id_order_return' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25), 'id_order_return' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'id_order' => array('title' => $this->l('Order ID'), 'width' => 25, 'align' => 'center'), 'id_order' => array('title' => $this->l('Order ID'), 'width' => 100, 'align' => 'center'),
'name' => array('title' => $this->l('Status'), 'width' => 'auto', 'align' => 'left'), 'name' => array('title' => $this->l('Status'), 'width' => 'auto', 'align' => 'left'),
'date_add' => array('title' => $this->l('Date issued'), 'width' => 120, 'type' => 'date', 'align' => 'right'), 'date_add' => array('title' => $this->l('Date issued'), 'width' => 150, 'type' => 'date', 'align' => 'right'),
); );
$this->options = array( $this->options = array(
css/admin.css
+1 -1
View File
@@ -2126,7 +2126,7 @@ div#scrollTop a:hover{
/*commandes*/ /*commandes*/
.container-command {width:100%} .container-command {width:100%}
.bloc-command {background-color:#F8F8F8; margin-bottom:10px;} .bloc-command {background-color:#EBEDF4; border:1px solid #CCCED7; margin-bottom:10px;}
.button-command {float:right; padding:10px;} .button-command {float:right; padding:10px;}
/*history status*/ /*history status*/
install-dev/view.css
+3 -2
View File
@@ -434,7 +434,7 @@ ul#optional {
background:#f8f8f8 url(img/bg_li_title.png) repeat-x 0 0; background:#f8f8f8 url(img/bg_li_title.png) repeat-x 0 0;
} }
ul#required li.required , ul#required li.required ,
ul#optional li.optional{ ul#optional li {
border-top:1px solid #fff; border-top:1px solid #fff;
border-bottom:1px solid #ccc; border-bottom:1px solid #ccc;
} }
@@ -632,10 +632,11 @@ ul#optional {
.blockInfoEnd p { .blockInfoEnd p {
font:italic 11px/14px Georgia, Arial, Sans-serif; font:italic 11px/14px Georgia, Arial, Sans-serif;
color:#666; color:#666;
min-height:58px;
} }
.blockInfoEnd img { .blockInfoEnd img {
float:left; float:left;
margin:0 14px 5px 0; margin:0 10px 5px 0;
} }
.blockInfoEnd a.BO, .blockInfoEnd a.BO,
.blockInfoEnd a.FO { .blockInfoEnd a.FO {
install-new/theme/view.css
+3 -2
View File
@@ -451,7 +451,7 @@ ul#optional {
background:#f8f8f8 url(img/bg_li_title.png) repeat-x 0 0; background:#f8f8f8 url(img/bg_li_title.png) repeat-x 0 0;
} }
ul#required li.required , ul#required li.required ,
ul#optional li.optional{ ul#optional li {
border-top:1px solid #fff; border-top:1px solid #fff;
border-bottom:1px solid #ccc; border-bottom:1px solid #ccc;
} }
@@ -566,10 +566,11 @@ ul#optional {
.blockInfoEnd p { .blockInfoEnd p {
font:italic 11px/14px Georgia, Arial, Sans-serif; font:italic 11px/14px Georgia, Arial, Sans-serif;
color:#666; color:#666;
min-height:58px;
} }
.blockInfoEnd img { .blockInfoEnd img {
float:left; float:left;
margin:0 14px 5px 0; margin:0 10px 5px 0;
} }
.blockInfoEnd a.BO, .blockInfoEnd a.BO,
.blockInfoEnd a.FO { .blockInfoEnd a.FO {