From 9b092a37cf22e8a07c299124ff9a880fa5bc3eb1 Mon Sep 17 00:00:00 2001 From: Sebastian Mendel Date: Wed, 2 Aug 2006 09:09:41 +0000 Subject: [PATCH] added variables to define (text) color for marked and hovered objects --- ChangeLog | 8 ++++ css/phpmyadmin.css.php | 16 ++++---- .../darkblue_orange/css/theme_right.css.php | 6 ++- themes/darkblue_orange/layout.inc.php | 41 +++++++++++-------- themes/original/css/theme_left.css.php | 10 +++-- themes/original/css/theme_right.css.php | 6 ++- themes/original/layout.inc.php | 36 +++++++++------- 7 files changed, 76 insertions(+), 47 deletions(-) diff --git a/ChangeLog b/ChangeLog index c1cdd982a..a44112510 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,14 @@ phpMyAdmin - ChangeLog $Id$ $Source$ +2006-08-02 Sebastian Mendel + * css\phpmyadmin.css.php, themes\darkblue_orange\css\theme_right.css.php + themes\darkblue_orange\layout.inc.php, themes\original\layout.inc.php + themes\original\css\theme_left.css.php, + themes\original\css\theme_right.css.php: + added variables to define (text) color for marked and hovered objects + thanks to Juergen Wind - windkiel for hinting this bug (patch #1503529) + 2006-08-01 Marc Delisle * Documentation.html: patch #1532493 + light editing from me, thanks to Isaac Bennetch diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php index 30b378a2d..d8320d8e5 100644 --- a/css/phpmyadmin.css.php +++ b/css/phpmyadmin.css.php @@ -709,8 +709,10 @@ if ($_SESSION['PMA_Theme']->checkVersion('2.9')) { /********************/ -div#left_tableList li.marked { - background-color: ; +/* marked items */ +.marked { + background: ; + color: ; } @@ -724,16 +726,12 @@ div#left_tableList li.marked { background: ; } -/* marked items */ -.marked { - background-color: ; -} - /* hovered items */ .odd:hover, .even:hover, .hover { - background-color: ; + background: ; + color: ; } /** @@ -743,7 +741,7 @@ tr.condition th, tr.condition td, td.condition, th.condition { - border: 1px solid ; + border: 1px solid ; } label.desc { diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index 0aebb944e..976b4e6e3 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -189,7 +189,8 @@ table tr.even { /* marked tbale rows */ table tr.marked th, table tr.marked { - background-color: ; + background: ; + color: ; } /* hovered table rows */ @@ -199,7 +200,8 @@ table tr.odd:hover th, table tr.even:hover th, table tr.hover th, table tr.hover { - background-color: ; + background: ; + color: ; } table .value { diff --git a/themes/darkblue_orange/layout.inc.php b/themes/darkblue_orange/layout.inc.php index 260a8ed82..b70f2efa2 100644 --- a/themes/darkblue_orange/layout.inc.php +++ b/themes/darkblue_orange/layout.inc.php @@ -8,32 +8,41 @@ * navi frame */ // navi frame width -$GLOBALS['cfg']['NaviWidth'] = 180; +$GLOBALS['cfg']['NaviWidth'] = 180; // foreground (text) color for the navi frame -$GLOBALS['cfg']['NaviColor'] = '#ffffff'; +$GLOBALS['cfg']['NaviColor'] = '#ffffff'; // background for the navi frame -$GLOBALS['cfg']['NaviBackground'] = '#666699'; +$GLOBALS['cfg']['NaviBackground'] = '#666699'; -// color of the pointer in navi frame -$GLOBALS['cfg']['NaviPointerColor'] = '#9999CC'; +// foreground (text) color of the pointer in navi frame +$GLOBALS['cfg']['NaviPointerColor'] = '#ffffff'; + +// background of the pointer in navi frame +$GLOBALS['cfg']['NaviPointerBackground'] = '#9999cc'; /** * main frame */ // foreground (text) color for the main frame -$GLOBALS['cfg']['MainColor'] = '#000000'; +$GLOBALS['cfg']['MainColor'] = '#000000'; // background for the main frame -$GLOBALS['cfg']['MainBackground'] = '#FFFFFF'; +$GLOBALS['cfg']['MainBackground'] = '#ffffff'; //$GLOBALS['cfg']['MainBackground'] = 'url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png)'; -// color of the pointer in browse mode -$GLOBALS['cfg']['BrowsePointerColor'] = '#CCFFCC'; +// foreground (text) color of the pointer in browse mode +$GLOBALS['cfg']['BrowsePointerColor'] = '#000000'; -// color of the marker (visually marks row by clicking on it) in browse mode -$GLOBALS['cfg']['BrowseMarkerColor'] = '#FFCC99'; +// background of the pointer in browse mode +$GLOBALS['cfg']['BrowsePointerBackground'] = '#ccffcc'; + +// foreground (text) color of the marker (visually marks row by clicking on it) in browse mode +$GLOBALS['cfg']['BrowseMarkerColor'] = '#000000'; + +// background of the marker (visually marks row by clicking on it) in browse mode +$GLOBALS['cfg']['BrowseMarkerBackground'] = '#ffcc99'; /** * fonts @@ -43,7 +52,7 @@ $GLOBALS['cfg']['BrowseMarkerColor'] = '#FFCC99'; * if not set the browser default will be used * (depending on browser, DTD and system settings) */ -$GLOBALS['cfg']['FontFamily'] = 'Verdana, Arial, Helvetica, sans-serif'; +$GLOBALS['cfg']['FontFamily'] = 'Verdana, Arial, Helvetica, sans-serif'; /** * fixed width font family, used in textarea */ @@ -53,7 +62,7 @@ $GLOBALS['cfg']['FontFamilyFixed'] = 'monospace'; * if not set the browser default will be used * (depending on browser, DTD and system settings) */ -$GLOBALS['cfg']['FontSize'] = ''; +$GLOBALS['cfg']['FontSize'] = ''; /** * tables @@ -73,15 +82,15 @@ $GLOBALS['cfg']['BgTwo'] = '#D5D5D5'; * query window */ // Width of Query window -$GLOBALS['cfg']['QueryWindowWidth'] = 600; +$GLOBALS['cfg']['QueryWindowWidth'] = 600; // Height of Query window -$GLOBALS['cfg']['QueryWindowHeight'] = 400; +$GLOBALS['cfg']['QueryWindowHeight'] = 400; /** * SQL Parser Settings * Syntax colouring data */ -$GLOBALS['cfg']['SQP']['fmtColor'] = array( +$GLOBALS['cfg']['SQP']['fmtColor'] = array( 'comment' => '#808000', 'comment_mysql' => '', 'comment_ansi' => '', diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index f7b7c64b1..8759908e1 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -73,7 +73,8 @@ div#leftframelinks a img.icon { } div#leftframelinks a:hover { - background-color: ; + background: ; + color: ; } /* leftdatabaselist */ @@ -91,12 +92,12 @@ div#left_tableList ul ul { } div#left_tableList a { - color: ; + color: inherit; text-decoration: none; } div#left_tableList a:hover { - color: ; + color: inherit; text-decoration: underline; } @@ -108,7 +109,8 @@ div#left_tableList li { div#left_tableList li:hover { - background-color: ; + background: ; + color: ; } diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 7faeb7cca..f41049d8b 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -166,7 +166,8 @@ table tr.even { /* marked tbale rows */ table tr.marked th, table tr.marked { - background-color: ; + background: ; + color: ; } /* hovered table rows */ @@ -176,7 +177,8 @@ table tr.odd:hover th, table tr.even:hover th, table tr.hover th, table tr.hover { - background-color: ; + background: ; + color: ; } table .value { diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php index 4d9c70926..437ce8d46 100644 --- a/themes/original/layout.inc.php +++ b/themes/original/layout.inc.php @@ -8,32 +8,40 @@ * navi frame */ // navi frame width -$GLOBALS['cfg']['NaviWidth'] = 200; +$GLOBALS['cfg']['NaviWidth'] = 200; // foreground (text) color for the navi frame -$GLOBALS['cfg']['NaviColor'] = '#000000'; +$GLOBALS['cfg']['NaviColor'] = '#000000'; // background for the navi frame -$GLOBALS['cfg']['NaviBackground'] = '#D0DCE0'; +$GLOBALS['cfg']['NaviBackground'] = '#D0DCE0'; -// color of the pointer in navi frame -$GLOBALS['cfg']['NaviPointerColor'] = '#CCFFCC'; +// foreground (text) color of the pointer in navi frame +$GLOBALS['cfg']['NaviPointerColor'] = '#CCFFCC'; +// background of the pointer in navi frame +$GLOBALS['cfg']['NaviPointerBackground'] = '#9999CC'; /** * main frame */ // foreground (text) color for the main frame -$GLOBALS['cfg']['MainColor'] = '#000000'; +$GLOBALS['cfg']['MainColor'] = '#000000'; // background for the main frame -$GLOBALS['cfg']['MainBackground'] = '#F5F5F5'; +$GLOBALS['cfg']['MainBackground'] = '#F5F5F5'; //$GLOBALS['cfg']['MainBackground'] = 'url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png)'; -// color of the pointer in browse mode -$GLOBALS['cfg']['BrowsePointerColor'] = '#CCFFCC'; +// foreground (text) color of the pointer in browse mode +$GLOBALS['cfg']['BrowsePointerColor'] = '#000000'; -// color of the marker (visually marks row by clicking on it) in browse mode -$GLOBALS['cfg']['BrowseMarkerColor'] = '#FFCC99'; +// background of the pointer in browse mode +$GLOBALS['cfg']['BrowsePointerBackground'] = '#CCFFCC'; + +// foreground (text) color of the marker (visually marks row by clicking on it) in browse mode +$GLOBALS['cfg']['BrowseMarkerColor'] = '#000000'; + +// background of the marker (visually marks row by clicking on it) in browse mode +$GLOBALS['cfg']['BrowseMarkerBackground'] = '#FFCC99'; /** * fonts @@ -73,15 +81,15 @@ $GLOBALS['cfg']['BgTwo'] = '#D5D5D5'; * query window */ // Width of Query window -$GLOBALS['cfg']['QueryWindowWidth'] = 600; +$GLOBALS['cfg']['QueryWindowWidth'] = 600; // Height of Query window -$GLOBALS['cfg']['QueryWindowHeight'] = 400; +$GLOBALS['cfg']['QueryWindowHeight'] = 400; /** * SQL Parser Settings * Syntax colouring data */ -$GLOBALS['cfg']['SQP']['fmtColor'] = array( +$GLOBALS['cfg']['SQP']['fmtColor'] = array( 'comment' => '#808000', 'comment_mysql' => '', 'comment_ansi' => '',