From 997bd4c5c968f64366acc04dae1f5cb09574c8a9 Mon Sep 17 00:00:00 2001 From: Sebastian Mendel Date: Fri, 11 Aug 2006 09:22:10 +0000 Subject: [PATCH] updated themes to 2.9 and some minor fixes --- ChangeLog | 9 ++- css/phpmyadmin.css.php | 7 +- .../darkblue_orange/css/theme_right.css.php | 66 +++++++++++------ themes/darkblue_orange/info.inc.php | 2 +- themes/darkblue_orange/layout.inc.php | 2 +- themes/original/css/theme_left.css.php | 33 ++++++++- themes/original/css/theme_right.css.php | 74 ++++++++++++------- themes/original/info.inc.php | 2 +- themes/original/layout.inc.php | 2 +- 9 files changed, 135 insertions(+), 62 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd1b3c660..3ed080205 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ phpMyAdmin - ChangeLog $Id$ $Source$ +2006-08-11 Sebastian Mendel + * css\phpmyadmin.css.php, themes\*: + updated themes to 2.9 and some minor fixes + thanks to Juergen Wind - windkiel for hinting this (patch #1535169) + 2006-08-10 Marc Delisle * lang/danish: Updated, thanks to AlleyKat - dk_alleykat * lang/catalan update, thanks to Xavier Navarro (xavin) @@ -21,7 +26,7 @@ $Source$ * libraries/display_select_lang.lib.php, lang/*: $strLanguage 2006-08-08 Marc Delisle - * db_operations.php: added a FIXME for db copy with Add Constraints + * db_operations.php: added a FIXME for db copy with Add Constraints and mysql extension 2006-08-05 Marc Delisle @@ -31,7 +36,7 @@ $Source$ 2006-08-04 Marc Delisle * tbl_properties_operations.php, libraries/export/sql.php: bug #1526000, copying table to another db (MYSQL 5.0.24) - * db_details_structure.php: bug #1530574, misaligned HTML + * db_details_structure.php: bug #1530574, misaligned HTML when db_collation is empty 2006-08-03 Sebastian Mendel diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php index d8320d8e5..372110ebb 100644 --- a/css/phpmyadmin.css.php +++ b/css/phpmyadmin.css.php @@ -343,10 +343,8 @@ ul#topmenu li { background-color: ; border: 1pt solid ; border-bottom: 0; - border-radius-topleft: 0.4em; - border-radius-topright: 0.4em; - -moz-border-radius-topleft: 0.4em; - -moz-border-radius-topright: 0.4em; + border-top-left-radius: 0.4em; + border-top-right-radius: 0.4em; } /* enabled hover/active tabs */ @@ -710,6 +708,7 @@ if ($_SESSION['PMA_Theme']->checkVersion('2.9')) { /* marked items */ +.marked a, .marked { background: ; color: ; diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index 976b4e6e3..69cf75c8b 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -46,7 +46,6 @@ a:visited, a:active { text-decoration: none; color: #333399; - } a:hover { @@ -170,6 +169,16 @@ button.mult_submit { background-color: transparent; } +/* odd items 1,3,5,7,... */ +.odd { + background: ; +} + +/* even items 2,4,6,8,... */ +.even { + background: ; +} + /* odd table rows 1,3,5,7,... */ table tr.odd th, table tr.odd { @@ -193,17 +202,32 @@ table tr.marked { color: ; } +/* hovered items */ +.odd:hover, +.even:hover, +.hover { + background: ; + color: ; +} + /* hovered table rows */ -table tr.odd:hover, -table tr.even:hover, table tr.odd:hover th, table tr.even:hover th, -table tr.hover th, -table tr.hover { +table tr.hover th { background: ; color: ; } +/** + * marks table rows/cells if the db field is in a where condition + */ +tr.condition th, +tr.condition td, +td.condition, +th.condition { + border: 1px solid ; +} + table .value { text-align: ; white-space: normal; @@ -516,6 +540,16 @@ body.loginform a.logo { text-align: center; } +body.loginform { + text-align: center; +} + +body.loginform div.container { + text-align: ; + width: 30em; + margin: 0 auto; +} + form.login label { float: ; width: 10em; @@ -593,10 +627,8 @@ ul#topmenu li { background-color: ; border: 1pt solid ; border-bottom: 0; - border-radius-topleft: 0.4em; - border-radius-topright: 0.4em; - -moz-border-radius-topleft: 0.4em; - -moz-border-radius-topright: 0.4em; + border-top-left-radius: 0.4em; + border-top-right-radius: 0.4em; } /* enabled hover/active tabs */ @@ -929,12 +961,12 @@ div#queryboxcontainer div#bookmarkoptions { } #maincontainer li { - margin-bottom: 0.3em; + margin-bottom: 0.3em; } /* END main page */ - + /* iconic view for ul items */ li#li_create_database { list-style-image: url(../getImgPath(); ?>b_newdb.png); @@ -1110,14 +1142,4 @@ li#li_flush_privileges { label.desc { width: 30em; float: ; -} - -body.loginform { - text-align: center; -} - -body.loginform div.container { - text-align: ; - width: 30em; - margin: 0 auto; -} +} \ No newline at end of file diff --git a/themes/darkblue_orange/info.inc.php b/themes/darkblue_orange/info.inc.php index d4b4846ad..40bbfd2c0 100644 --- a/themes/darkblue_orange/info.inc.php +++ b/themes/darkblue_orange/info.inc.php @@ -2,5 +2,5 @@ /* $Id$ */ /* Theme information */ $theme_name = 'Darkblue/orange'; -$theme_full_version = '2.8'; +$theme_full_version = '2.9'; ?> diff --git a/themes/darkblue_orange/layout.inc.php b/themes/darkblue_orange/layout.inc.php index b70f2efa2..40ccde60b 100644 --- a/themes/darkblue_orange/layout.inc.php +++ b/themes/darkblue_orange/layout.inc.php @@ -17,7 +17,7 @@ $GLOBALS['cfg']['NaviColor'] = '#ffffff'; $GLOBALS['cfg']['NaviBackground'] = '#666699'; // foreground (text) color of the pointer in navi frame -$GLOBALS['cfg']['NaviPointerColor'] = '#ffffff'; +$GLOBALS['cfg']['NaviPointerColor'] = '#000000'; // background of the pointer in navi frame $GLOBALS['cfg']['NaviPointerBackground'] = '#9999cc'; diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index 8759908e1..e6cd0e59c 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -77,6 +77,21 @@ div#leftframelinks a:hover { color: ; } +/* serverlist */ +#body_leftFrame #list_server { + list-style-image: url(..//original/img/s_host.png); + list-style-position: inside; + list-style-type: none; + margin: 0; + padding: 0; +} + +#body_leftFrame #list_server li { + margin: 0; + padding: 0; + font-size: 80%; +} + /* leftdatabaselist */ div#left_tableList ul { list-style-type: none; @@ -92,12 +107,14 @@ div#left_tableList ul ul { } div#left_tableList a { - color: inherit; + background: ; + color: ; text-decoration: none; } div#left_tableList a:hover { - color: inherit; + background: ; + color: ; text-decoration: underline; } @@ -107,8 +124,18 @@ div#left_tableList li { white-space: nowrap; } + +/* marked items */ +div#left_tableList > ul li.marked > a, +div#left_tableList > ul li.marked { + background: ; + color: ; +} + + -div#left_tableList li:hover { +div#left_tableList > ul li:hover > a, +div#left_tableList > ul li:hover { background: ; color: ; } diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index f41049d8b..7c3fd9f46 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -37,7 +37,8 @@ h3 { } a:link, -a:visited { +a:visited, +a:active { text-decoration: none; color: #0000FF; } @@ -149,17 +150,23 @@ button.mult_submit { background-color: transparent; } -/* odd table rows 1,3,5,7,... */ +/* odd items 1,3,5,7,... */ table tr.odd th, -table tr.odd { - background: ; - text-align: ; +.odd { + background: ; } -/* even table rows 2,4,6,8,... */ +/* even items 2,4,6,8,... */ +table tr.even th, +.even { + background: ; +} + +/* odd table rows 1,3,5,7,... */ +table tr.odd th, +table tr.odd, table tr.even th, table tr.even { - background: ; text-align: ; } @@ -170,17 +177,32 @@ table tr.marked { color: ; } +/* hovered items */ +.odd:hover, +.even:hover, +.hover { + background: ; + color: ; +} + /* hovered table rows */ -table tr.odd:hover, -table tr.even:hover, table tr.odd:hover th, table tr.even:hover th, -table tr.hover th, -table tr.hover { +table tr.hover th { background: ; color: ; } +/** + * marks table rows/cells if the db field is in a where condition + */ +tr.condition th, +tr.condition td, +td.condition, +th.condition { + border: 1px solid ; +} + table .value { text-align: ; white-space: normal; @@ -490,6 +512,16 @@ body.loginform a.logo { text-align: center; } +body.loginform { + text-align: center; +} + +body.loginform div.container { + text-align: ; + width: 30em; + margin: 0 auto; +} + form.login label { float: ; width: 10em; @@ -567,10 +599,8 @@ ul#topmenu li { background-color: ; border: 1pt solid ; border-bottom: 0; - border-radius-topleft: 0.4em; - border-radius-topright: 0.4em; - -moz-border-radius-topleft: 0.4em; - -moz-border-radius-topright: 0.4em; + border-top-left-radius: 0.4em; + border-top-right-radius: 0.4em; } /* enabled hover/active tabs */ @@ -877,7 +907,7 @@ div#queryboxcontainer div#bookmarkoptions { } #maincontainer li { - margin-bottom: 0.3em; + margin-bottom: 0.3em; } /* END main page */ @@ -1058,14 +1088,4 @@ li#li_flush_privileges { label.desc { width: 30em; float: ; -} - -body.loginform { - text-align: center; -} - -body.loginform div.container { - text-align: ; - width: 30em; - margin: 0 auto; -} +} \ No newline at end of file diff --git a/themes/original/info.inc.php b/themes/original/info.inc.php index 914e86ac8..480632e01 100644 --- a/themes/original/info.inc.php +++ b/themes/original/info.inc.php @@ -2,5 +2,5 @@ /* $Id$ */ /* Theme information */ $theme_name = 'Original'; -$theme_full_version = '2.8'; +$theme_full_version = '2.9'; ?> diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php index 437ce8d46..a2074973d 100644 --- a/themes/original/layout.inc.php +++ b/themes/original/layout.inc.php @@ -17,7 +17,7 @@ $GLOBALS['cfg']['NaviColor'] = '#000000'; $GLOBALS['cfg']['NaviBackground'] = '#D0DCE0'; // foreground (text) color of the pointer in navi frame -$GLOBALS['cfg']['NaviPointerColor'] = '#CCFFCC'; +$GLOBALS['cfg']['NaviPointerColor'] = '#000000'; // background of the pointer in navi frame $GLOBALS['cfg']['NaviPointerBackground'] = '#9999CC';