Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

This commit is contained in:
Madhura Jayaratne 2011-08-17 23:24:39 +05:30
commit c5cbe21277
3 changed files with 8 additions and 5 deletions

View File

@ -1614,6 +1614,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
* Initialize grid
******************/
// add relative position to table so that resize handlers are correctly positioned
$(t).css('position', 'relative');
// wrap all data cells, except actions cell, with span
$(t).find('th, td:not(:has(span))')
.wrapInner('<span />');

View File

@ -284,6 +284,9 @@ th.headerSortUp img.sortableIcon { background-position: 0 -1445px; width: 11px;
/* Same as s_desc */
th.headerSortDown img.sortableIcon { background-position: 0 -1528px; width: 11px; height: 9px; }
/* Fix position */
.ic_more { vertical-align: middle; }
/******************************************************************************/
/* classes */
.clearfloat {
@ -2407,10 +2410,6 @@ span.cm-number {
padding: 1px 3px !important;
}
.data {
position: relative;
}
.cHide {
background: #D3DCE3 url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>col_hide.png);
color: #CCC;

View File

@ -72,7 +72,6 @@ h2 a img{display:inline;}
.data{
margin: 0 0 12px 0;
position: relative;
}
h3 {
@ -468,6 +467,8 @@ th.headerSortUp img.sortableIcon { background-position: -1516px 0; }
/* Same as s_desc */
th.headerSortDown img.sortableIcon { background-position: 0 0; }
/* Fix position */
.ic_more { vertical-align: middle; }
/******************************************************************************/
/* classes */