Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-07-18 22:21:23 +02:00
commit bcf2917e1b
3 changed files with 3 additions and 2 deletions

View File

@ -24,6 +24,7 @@ phpMyAdmin - ChangeLog
4.2.7.0 (not yet released)
- bug Broken links on home page
- bug #4494 Overlap in navigation panel
4.2.6.0 (2014-07-17)
- bug #4471 Undefined index warning with referenced column.

View File

@ -129,7 +129,7 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
}
#pma_navigation_tree_content a.hover_show_full {
position: relative;
z-index: 9999;
z-index: 100;
}
#pma_navigation_tree a {
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;

View File

@ -115,7 +115,7 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
}
#pma_navigation_tree_content a.hover_show_full {
position: relative;
z-index: 9999;
z-index: 100;
}
#pma_navigation_tree a {
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;