3.0 update

This commit is contained in:
Marc Delisle
2008-10-24 10:25:59 +00:00
parent c39c953a2a
commit e79e05390e
6 changed files with 170 additions and 33 deletions

View File

@@ -15,13 +15,20 @@ if (!defined('PMA_MINIMUM_COMMON')) {
?> ?>
/******************************************************************************/ /******************************************************************************/
/* general tags */ /* general tags */
html {
font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>;
}
input, select, textarea {
font-size: 1em;
}
body { body {
<?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?> <?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>; font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
<?php } ?> <?php } ?>
font-size: 0.8em; font-size: 0.8em;
background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>; background: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>; color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
margin: 0; margin: 0;
padding: 0.2em 0.2em 0.2em 0.2em; padding: 0.2em 0.2em 0.2em 0.2em;
@@ -34,8 +41,14 @@ a img {
border: 0; border: 0;
} }
a:link,
a:visited,
a:active {
text-decoration: none;
}
ul { ul {
margin:0; margin:0;
} }
form { form {
@@ -61,11 +74,11 @@ select#lightm_db {
padding-bottom: 3px; padding-bottom: 3px;
} }
select { select {
background-color: #ffffff; background-color: #ffffff;
color: #000000; color: #000000;
width: 100%; width: 100%;
border: 1px solid #3674CF;
} }
/* buttons in some browsers (eg. Konqueror) are block elements, /* buttons in some browsers (eg. Konqueror) are block elements,
@@ -93,6 +106,11 @@ button {
/******************************************************************************/ /******************************************************************************/
/* specific elements */ /* specific elements */
div#pmalogo {
<?php //better echo $GLOBALS['cfg']['logoBGC']; ?>
background-color: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
padding:.3em;
}
div#pmalogo, div#pmalogo,
div#leftframelinks, div#leftframelinks,
div#databaseList { div#databaseList {
@@ -234,6 +252,7 @@ div#left_tableList ul ul {
padding-bottom: 0.1em; padding-bottom: 0.1em;
border-bottom: 0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>; border-bottom: 0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
} }
/* for the servers list in navi panel */ /* for the servers list in navi panel */
#serverinfo .item { #serverinfo .item {
white-space: nowrap; white-space: nowrap;

View File

@@ -16,8 +16,11 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/******************************************************************************/ /******************************************************************************/
/* general tags */ /* general tags */
html { html {
margin: 0; font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>;
padding: 0; }
input, select, textarea {
font-size: 1em;
} }
body { body {
@@ -27,7 +30,7 @@ body {
padding: 0; padding: 0;
margin: 0.5em; margin: 0.5em;
color: <?php echo $GLOBALS['cfg']['MainColor']; ?>; color: <?php echo $GLOBALS['cfg']['MainColor']; ?>;
background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>; background: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;
font-size: 1em; font-size: 1em;
} }
@@ -36,7 +39,6 @@ textarea, tt, pre, code {
font-family: <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>; font-family: <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
} }
<?php } ?> <?php } ?>
h1 { h1 {
font-size: 140%; font-size: 140%;
font-weight: bold; font-weight: bold;
@@ -163,6 +165,7 @@ a.drop:hover{
textarea { textarea {
overflow: visible; overflow: visible;
height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
} }
fieldset { fieldset {
@@ -177,9 +180,9 @@ fieldset fieldset {
} }
fieldset legend { fieldset legend {
color: <?php echo $GLOBALS['cfg']['ThBackground']; ?>; font-weight: bold;
font-weight: bold; color: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
background-color: <?php echo $GLOBALS['cfg']['BgTwo']; ?>; background-color: <?php echo 'OPERA' != PMA_USR_BROWSER_AGENT ? 'transparent' : $GLOBALS['cfg']['BgTwo']; ?>;
padding: 2px; padding: 2px;
} }
@@ -207,7 +210,12 @@ button {
/******************************************************************************/ /******************************************************************************/
/* classes */ /* classes */
div.tools {
border: 1px solid <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
padding: 0.2em;
}
div.tools,
fieldset.tblFooters { fieldset.tblFooters {
margin-top: 0; margin-top: 0;
margin-bottom: 0.5em; margin-bottom: 0.5em;
@@ -317,6 +325,7 @@ table [class=value] {
white-space: normal; white-space: normal;
} }
<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?> <?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
.value { .value {
font-family: <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>; font-family: <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
@@ -437,12 +446,25 @@ td .icon {
} }
/* message boxes: warning, error, confirmation */ /* message boxes: warning, error, confirmation */
.success h1,
.notice h1,
.warning h1,
div.error h1 {
border-bottom: 2px solid;
font-weight: bold;
text-align: <?php echo $left; ?>;
margin: 0 0 0.2em 0;
}
.notice { .notice {
color: #000000; color: #000000;
background-color: #FFFFDD; background-color: #FFFFDD;
} }
h1.notice, h1.notice,
div.notice { div.success,
div.notice,
div.warning,
div.error {
margin: 0.5em 0 0.5em 0; margin: 0.5em 0 0.5em 0;
border: 1px solid #FFD700; border: 1px solid #FFD700;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?> <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
@@ -459,6 +481,33 @@ div.notice {
padding: 0.5em; padding: 0.5em;
<?php } ?> <?php } ?>
} }
.success {
color: #005E20;
background-color: #E5F7E3;
}
h1.success,
div.success {
border-color: #C5E1C8;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_success.png);
<?php } ?>
}
.success h1 {
border-color: #C5E1C8;
}
.notice {
color: #004A80;
background-color: #E8F8FE;
}
h1.notice,
div.notice {
border-color: #CFDFE5;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_info.png);
<?php } ?>
}
.notice h1 { .notice h1 {
border-bottom: 1px solid #FFD700; border-bottom: 1px solid #FFD700;
font-weight: bold; font-weight: bold;
@@ -467,14 +516,14 @@ div.notice {
} }
.warning { .warning {
color: #CC0000; color: #555555;
background-color: #FFFFCC; background-color: #FEFFD5;
} }
p.warning, p.warning,
h1.warning, h1.warning,
div.warning { div.warning {
margin: 0.5em 0 0.5em 0; margin: 0.5em 0 0.5em 0;
border: 1px solid #CC0000; border: 1px solid #EEEB5B;
<?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?> <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png); background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png);
background-repeat: no-repeat; background-repeat: no-repeat;
@@ -497,14 +546,14 @@ div.warning {
} }
.error { .error {
background-color: #FFFFCC; background-color: #FFEBEB;
color: #ff0000; color: #9E0B0F;
} }
h1.error, h1.error,
div.error { div.error {
margin: 0.5em 0 0.5em 0; margin: 0.5em 0 0.5em 0;
border: 1px solid #ff0000; border: 1px solid #F5C1C2;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?> <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png); background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png);
background-repeat: no-repeat; background-repeat: no-repeat;
@@ -570,6 +619,7 @@ fieldset.confirmation legend {
background-position:top; background-position:top;
} }
div.tools,
.tblFooters { .tblFooters {
font-weight: normal; font-weight: normal;
color: <?php echo $GLOBALS['cfg']['ThColor']; ?>; color: <?php echo $GLOBALS['cfg']['ThColor']; ?>;
@@ -582,6 +632,9 @@ fieldset.confirmation legend {
.tblHeaders a:link, .tblHeaders a:link,
.tblHeaders a:active, .tblHeaders a:active,
.tblHeaders a:visited, .tblHeaders a:visited,
div.tools a:link,
div.tools a:visited,
div.tools a:active,
.tblFooters a:link, .tblFooters a:link,
.tblFooters a:active, .tblFooters a:active,
.tblFooters a:visited { .tblFooters a:visited {
@@ -590,9 +643,10 @@ fieldset.confirmation legend {
} }
.tblHeaders a:hover, .tblHeaders a:hover,
div.tools a:hover,
.tblFooters a:hover { .tblFooters a:hover {
text-decoration: none;
color: #FFFFFF; color: #FFFFFF;
text-decoration: none;
} }
/* forbidden, no privilegs */ /* forbidden, no privilegs */
@@ -644,7 +698,7 @@ body.loginform div.container {
form.login label { form.login label {
float: <?php echo $left; ?>; float: <?php echo $left; ?>;
width: 11em; width: 10em;
font-weight: bolder; font-weight: bolder;
} }
@@ -663,13 +717,17 @@ form.login fieldset div.item select {
} }
.loginform .container fieldset select[name=lang] { .loginform .container fieldset select[name=lang] {
width: 25em; width: 24em;
} }
/******************************************************************************/ /******************************************************************************/
/* specific elements */ /* specific elements */
/* topmenu */ /* topmenu */
div#topmenucontainer {
padding-bottom: 18px;
}
ul#topmenu { ul#topmenu {
font-weight: bold; font-weight: bold;
list-style-type: none; list-style-type: none;
@@ -710,14 +768,14 @@ span.tab {
/* disabled drop/empty tabs */ /* disabled drop/empty tabs */
span.tabcaution { span.tabcaution {
color: #FFFFFF; color: #FFFFFF;
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbl_header_disabled.png); background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbl_header_disabled.png);
background-repeat: repeat-x; background-repeat: repeat-x;
background-position: top; background-position: top;
text-decoration: none; text-decoration: none;
padding-top: 4px; padding-top: 4px;
padding-bottom: 4px; padding-bottom: 4px;
padding-left: 4px; padding-left: 4px;
padding-right: 10px; padding-right: 10px;
} }
/* enabled drop/empty tabs */ /* enabled drop/empty tabs */
@@ -766,7 +824,7 @@ ul#topmenu li a.tab {
ul#topmenu li a.tab:hover { ul#topmenu li a.tab:hover {
color: #FFFFFF; color: #FFFFFF;
text-decoration: none; text-decoration: none;
} }
ul#topmenu li:hover { ul#topmenu li:hover {
@@ -1102,7 +1160,6 @@ div#queryboxcontainer div#bookmarkoptions {
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>logo_right.png); background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>logo_right.png);
background-position: <?php echo $right; ?> bottom; background-position: <?php echo $right; ?> bottom;
background-repeat: no-repeat; background-repeat: no-repeat;
border-bottom: 1px solid <?php echo $GLOBALS['cfg']['ThBackground']?>;
} }
#selflink { #selflink {
margin-top: 1em; margin-top: 1em;
@@ -1159,15 +1216,15 @@ li#li_server_info2,
li#li_mysql_proto, li#li_mysql_proto,
li#li_user_info, li#li_user_info,
li#li_used_php_extension, li#li_used_php_extension,
li#li_web_server_software,
li#li_mysql_client_version, li#li_mysql_client_version,
li#li_select_server,
li#li_server_info, li#li_server_info,
li#li_server_version { li#li_server_version {
color: #888888; color: #888888;
} }
#form_fontsize_selection label { #form_fontsize_selection label {
color: #1F457E; color: #142F56;
} }
#mysqlmaininformation { #mysqlmaininformation {
@@ -1199,13 +1256,21 @@ li#li_select_lang {
li#li_select_mysql_collation, li#li_select_mysql_collation,
li#li_select_mysql_charset { li#li_select_mysql_charset {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png); list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
color: #1F457E; color: #1F457E;
} }
li#li_select_theme{ li#li_select_theme{
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_theme.png); list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_theme.png);
} }
li#li_custom_color{
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_color.png);
}
#myRainbow {
padding-right: 4px;
}
li#li_server_info, li#li_server_info,
li#li_server_info2, li#li_server_info2,
li#li_server_version { li#li_server_version {
@@ -1299,14 +1364,22 @@ li#li_used_php_extension {
margin-bottom: 2em; margin-bottom: 2em;
} }
li#li_pma_version {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_ltr.png);
}
li#li_web_server_software {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_ltr.png);
font-size: 80%;
}
li#li_mysql_client_version { li#li_mysql_client_version {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_ltr.png); list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_ltr.png);
font-size: 80%; font-size: 80%;
} }
li#li_select_server { li#li_select_server {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_ltr.png); list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_host.png);
font-size: 80%;
} }
li#li_select_fontsize { li#li_select_fontsize {
@@ -1372,7 +1445,10 @@ li#li_select_fontsize {
float: <?php echo $left; ?>; float: <?php echo $left; ?>;
} }
#div_table_copy { #div_table_copy,
#div_partition_maintenance,
#div_referential_integrity,
#div_table_maintenance {
min-width: 48%; min-width: 48%;
float: <?php echo $left; ?>; float: <?php echo $left; ?>;
} }
@@ -1395,3 +1471,45 @@ label.desc {
width: 30em; width: 30em;
float: <?php echo $left; ?>; float: <?php echo $left; ?>;
} }
code.sql {
display: block;
padding: 0.3em;
margin-top: 0;
margin-bottom: 0;
border: #79A2DF solid 1px;
border-bottom: 0;
max-height: 10em;
overflow: auto;
background: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
}
#main_pane_left {
width: 60%;
float: <?php echo $left; ?>;
padding-top: 1em;
}
#main_pane_right {
margin-<?php echo $left; ?>: 60%;
padding-top: 1em;
padding-<?php echo $left; ?>: 1em;
}
.group {
border: 1px solid <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
margin-bottom: 1em;
}
.group h2 {
font-size: 1em;
font-weight: bold;
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbl_header.png);
background-position:left top;
background-repeat: repeat-x;
color: #FFFFFF;
padding: 2px;
margin: 0;
display: block;
border: 1px solid #FBFBFF;
}

BIN
paradice/img/s_color.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 831 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 848 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 831 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 20 KiB