[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-22460-g1816110

[Marc Delisle]

The branch, master has been updated
       via  1816110fbf9f8bddafb12a8862fc67e536cc1dfa (commit)
       via  4d1e6f302f04543ce1fea0524d3d8179ee894d21 (commit)
      from  d5a3be56efae8337b59f756537804ca053e7fbef (commit)


- Log -----------------------------------------------------------------
commit 1816110fbf9f8bddafb12a8862fc67e536cc1dfa
Merge: d5a3be5 4d1e6f3
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Nov 7 05:33:55 2011 -0500

    Merge commit '4d1e6f302f04543ce1fea0524d3d8179ee894d21'

commit 4d1e6f302f04543ce1fea0524d3d8179ee894d21
Author: Rouslan Placella <rouslan at placella.com>
Date:   Sun Nov 6 12:46:02 2011 +0000

    Fix column border visibility in makegrid.js

-----------------------------------------------------------------------

Summary of changes:
 js/makegrid.js                          |    2 ++
 themes/original/css/theme_right.css.php |    5 ++++-
 themes/pmahomme/css/theme_right.css.php |    5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/js/makegrid.js b/js/makegrid.js
index d87b7b4..299315a 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -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) {
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index aaacd44..289d5c4 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -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;
 }
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 0737a37..19a86c8 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -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;
 }


hooks/post-receive
-- 
phpMyAdmin