Merge pull request #1176 from D-storm/custom-css

jquery-ui css should have low priority over phpmyadmin.css.php
This commit is contained in:
Marc Delisle 2014-05-15 06:15:09 -04:00
commit 0db0ef0e0d

View File

@ -588,12 +588,12 @@ class PMA_Header
$retval .= '<link rel="stylesheet" type="text/css" href="'
. $basedir . 'print.css" />';
} else {
$retval .= '<link rel="stylesheet" type="text/css" href="'
. $theme_path . '/jquery/jquery-ui-1.9.2.custom.css" />';
$retval .= '<link rel="stylesheet" type="text/css" href="'
. $basedir . 'phpmyadmin.css.php'
. $common_url . '&amp;nocache='
. $theme_id . $GLOBALS['text_dir'] . '" />';
$retval .= '<link rel="stylesheet" type="text/css" href="'
. $theme_path . '/jquery/jquery-ui-1.9.2.custom.css" />';
}
return $retval;