Merge commit '4d1e6f302f04543ce1fea0524d3d8179ee894d21'
This commit is contained in:
commit
1816110fbf
@ -80,6 +80,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
|
||||
*/
|
||||
dragStartRsz: function(e, obj) {
|
||||
var n = $(g.cRsz).find('div').index(obj); // get the index of separator (i.e., column index)
|
||||
$(obj).addClass('colborder_active');
|
||||
g.colRsz = {
|
||||
x0: e.pageX,
|
||||
n: n,
|
||||
@ -195,6 +196,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
|
||||
g.reposRsz();
|
||||
g.reposDrop();
|
||||
g.colRsz = false;
|
||||
$(g.cRsz).find('div').removeClass('colborder_active');
|
||||
} else if (g.colReorder) {
|
||||
// shift columns
|
||||
if (g.colReorder.newn != g.colReorder.n) {
|
||||
|
||||
@ -2195,7 +2195,6 @@ span.CodeMirror-selected {
|
||||
<?php echo $_SESSION['PMA_Theme']->getCssCodeMirror(); ?>
|
||||
|
||||
.colborder {
|
||||
border-right: solid 1px #FFFFFF;
|
||||
cursor: col-resize;
|
||||
height: 100%;
|
||||
margin-left: -5px;
|
||||
@ -2203,6 +2202,10 @@ span.CodeMirror-selected {
|
||||
width: 5px;
|
||||
}
|
||||
|
||||
.colborder_active {
|
||||
border-right: 2px solid #a44;
|
||||
}
|
||||
|
||||
.pma_table td {
|
||||
position: static;
|
||||
}
|
||||
|
||||
@ -2606,7 +2606,6 @@ span.CodeMirror-selected {
|
||||
<?php echo $_SESSION['PMA_Theme']->getCssCodeMirror(); ?>
|
||||
|
||||
.colborder {
|
||||
border-right: 1px solid #FFF;
|
||||
cursor: col-resize;
|
||||
height: 100%;
|
||||
margin-left: -6px;
|
||||
@ -2614,6 +2613,10 @@ span.CodeMirror-selected {
|
||||
width: 5px;
|
||||
}
|
||||
|
||||
.colborder_active {
|
||||
border-right: 2px solid #a44;
|
||||
}
|
||||
|
||||
.pma_table td {
|
||||
position: static;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user