Merge branch 'QA_4_5'

ChangeLog

@@ -29,6 +29,7 @@ phpMyAdmin - ChangeLog
 - issue #11632 Exporting GIS visualization ignores start and row count
 - issue #11476 Errors instead of git info when PHP has no gzip support
 - issue #11633 CodeMirror tooltip shows below modal window
+- issue #11639 Bug with the MainBackground Color
 
 4.5.1.0 (2015-10-23)
 - issue        Invalid argument supplied for foreach()

themes/pmahomme/css/common.css.php

@@ -29,13 +29,12 @@ textarea {
 body {
 <?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
     font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
-    <?php
-} ?>
+<?php } ?>
     padding: 0;
     margin: 0;
     margin-<?php echo $left; ?>: 240px;
-    color: #444;
-    background: #fff;
+    color: <?php echo $GLOBALS['cfg']['MainColor']; ?>;
+    background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
 }
 
 body#loginform {
@@ -2790,10 +2789,6 @@ fieldset .disabled-field td {
   user-select: none;
 }
 
-#page_content {
-    background-color: white;
-}
-
 .navigation {
     margin: .8em 0;
 

themes/pmahomme/layout.inc.php

@@ -30,10 +30,10 @@ $GLOBALS['cfg']['NaviPointerBackground']    = '#ddd';
  * main frame
  */
 // foreground (text) color for the main frame
-$GLOBALS['cfg']['MainColor']                = '#000';
+$GLOBALS['cfg']['MainColor']                = '#444';
 
 // background for the main frame
-$GLOBALS['cfg']['MainBackground']           = '#F5F5F5';
+$GLOBALS['cfg']['MainBackground']           = '#fff';
 
 // foreground (text) color of the pointer in browse mode
 $GLOBALS['cfg']['BrowsePointerColor']       = '#000';