The branch, master has been updated via 6a5af526bb2c3a0a138b2255bb67381d379f4311 (commit) via 0b24e6943505fad97e7fba3263bf863cdb7c01dd (commit) from aabc89141a3348ff3ca93719625e15d70784ead4 (commit)
- Log ----------------------------------------------------------------- commit 6a5af526bb2c3a0a138b2255bb67381d379f4311 Merge: aabc891 0b24e69 Author: Marc Delisle marc@infomarc.info Date: Wed Nov 2 07:42:59 2011 -0400
Fix merge conflicts
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + themes/pmahomme/css/theme_right.css.php | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 682b45b..d830787 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ phpMyAdmin - ChangeLog - bug #3427256 [interface] no links to browse/empty views and tables - bug #3430377 [interface] Deleted search results remain visible - bug #3428627 [import] ODS import ignores memory limits +- bug #3426836 [interface] Visual column separation
3.4.7.0 (2011-10-23) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 324f661..30edd54 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -57,7 +57,6 @@ h2 { h2 img{display:none;} h2 a img{display:inline;}
- .data, .data_full_width { margin: 0 0 12px 0; @@ -67,6 +66,10 @@ h2 a img{display:inline;} width: 100%; }
+#table_results td.data { +border-right: 1px solid #444444; +} + h3 { font-weight: bold; } @@ -367,9 +370,10 @@ table tr.odd th, }
/* even items 2,4,6,8,... */ +/* (tested on CRTs and ACLs) */ table tr.even th, .even { - background: #f3f3f3; + background: #DFDFDF; <?php echo $_SESSION['PMA_Theme']->getCssIEClearFilter(); ?> }
hooks/post-receive