diff --git a/ChangeLog b/ChangeLog index 7c1648a7b..18ff101dd 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ phpMyAdmin - Changelog $Id$ $Source$ +2002-07-24 Robin Johnson + * config.inc.php3, libraries/sqlparser.lib.php3: + - Fix code to work around CSS bug in Mozilla/Konqueror with 'inherit' + value. + 2002-07-25 Marc Delisle * Documentation.html, clarify about mysql extensions * tbl_properties_options.php3, tbl_properties_table_info.php3: diff --git a/config.inc.php3 b/config.inc.php3 index cb2d18745..227bef191 100755 --- a/config.inc.php3 +++ b/config.inc.php3 @@ -294,12 +294,12 @@ $cfg['SQP']['fmtInd'] = '1'; // Amount to indent each level (floa $cfg['SQP']['fmtIndUnit'] = 'em'; // Units for indenting each level (CSS Types - {em,px,pt}) $cfg['SQP']['fmtColor'] = array( // Syntax colouring data 'comment' => '#808000', - 'digit' => 'inherit', + 'digit' => '', 'digit_hex' => 'teal', 'digit_integer' => 'teal', 'digit_float' => 'aqua', 'punct' => 'fuchsia', - 'alpha' => 'inherit', + 'alpha' => '', 'alpha_columnType' => '#FF9900', 'alpha_columnAttrib' => '#0000FF', 'alpha_reservedWord' => '#990099', @@ -307,9 +307,9 @@ $cfg['SQP']['fmtColor'] = array( // Syntax colouring data 'alpha_identifier' => 'black', 'alpha_variable' => '#800000', 'quote' => '#008000', - 'quote_double' => 'inherit', - 'quote_single' => 'inherit', - 'quote_backtick' => 'inherit' + 'quote_double' => '', + 'quote_single' => '', + 'quote_backtick' => '' ); diff --git a/libraries/sqlparser.lib.php3 b/libraries/sqlparser.lib.php3 index 07f247531..e9072c8a6 100644 --- a/libraries/sqlparser.lib.php3 +++ b/libraries/sqlparser.lib.php3 @@ -755,13 +755,18 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) { } // end of the "PMA_SQP_formatHtml()" function - function PMA_SQP_buildCssRule($classname, $property, $value) + function PMA_SQP_BuildCssRule($classname, $property, $value) { - return '.' . $classname . ' { ' . $property . ': ' . $value . '; } ' . "\n"; + $str = '.' . $classname . ' {'; + if($value != '') { + $str .= $property . ': ' . $value . '; '; + } + $str .= '}' . "\n"; + return $str; } // end of the "PMA_SQP_buildCssRule()" function - function PMA_SQP_buildCssData() + function PMA_SQP_BuildCssData() { global $cfg;