nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

Browse Source 
Conflicts:
	libraries/db_links.inc.php
	libraries/tbl_links.inc.php
This commit is contained in:
Crack
2010-08-01 23:19:21 +02:00
parent 279724d6f8 887e2be664
commit 53e8d75c0f
81 changed files with 11031 additions and 7877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
themes/darkblue_orange/css/theme_right.css.php
View File

@@ -429,6 +429,14 @@ div.success {
border-color: #00FF00;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_success.png);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
background-position: 5px 50%;
padding: 0.2em 0.2em 0.2em 25px;
<?php } else { ?>
background-position: 97% 50%;
padding: 0.2em 25px 0.2em 0.2em;
<?php } ?>
<?php } ?>
}
.success h1 {
@@ -444,6 +452,14 @@ div.notice {
border-color: #FFD700;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
background-position: 5px 50%;
padding: 0.2em 0.2em 0.2em 25px;
<?php } else { ?>
background-position: 97% 50%;
padding: 0.2em 25px 0.2em 0.2em;
<?php } ?>
<?php } ?>
}
.notice h1 {
@@ -460,6 +476,14 @@ div.warning {
border-color: #CC0000;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
background-position: 5px 50%;
padding: 0.2em 0.2em 0.2em 25px;
<?php } else { ?>
background-position: 97% 50%;
padding: 0.2em 25px 0.2em 0.2em;
<?php } ?>
<?php } ?>
}
.warning h1 {
@@ -476,6 +500,14 @@ div.error {
border-color: #ff0000;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
background-position: 5px 50%;
padding: 0.2em 0.2em 0.2em 25px;
<?php } else { ?>
background-position: 97% 50%;
padding: 0.2em 25px 0.2em 0.2em;
<?php } ?>
<?php } ?>
}
div.error h1 {
@@ -691,6 +723,13 @@ ul#topmenu a.tabcaution:hover {
color: #FFFFFF;
background-color: #FF0000;
}
fieldset.caution a {
color: #FF0000;
}
fieldset.caution a:hover {
color: #ffffff;
background-color: #FF0000;
}
<?php if ($GLOBALS['cfg']['LightTabs']) { ?>
/* active tab */
@@ -1252,7 +1291,7 @@ li#li_user_preferences {
float: <?php echo $left; ?>;
}
#div_table_copy, #div_partition_maintenance, #div_referential_integrity, #div_table_maintenance {
#div_table_copy, #div_partition_maintenance, #div_referential_integrity, #div_table_removal, #div_table_maintenance {
min-width: 48%;
float: <?php echo $left; ?>;
}

40
themes/original/css/theme_right.css.php
View File

@@ -405,6 +405,14 @@ div.success {
border-color: #00FF00;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_success.png);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
background-position: 5px 50%;
padding: 0.2em 0.2em 0.2em 25px;
<?php } else { ?>
background-position: 97% 50%;
padding: 0.2em 25px 0.2em 0.2em;
<?php } ?>
<?php } ?>
}
.success h1 {
@@ -420,6 +428,14 @@ div.notice {
border-color: #FFD700;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
background-position: 5px 50%;
padding: 0.2em 0.2em 0.2em 25px;
<?php } else { ?>
background-position: 97% 50%;
padding: 0.2em 25px 0.2em 0.2em;
<?php } ?>
<?php } ?>
}
.notice h1 {
@@ -436,6 +452,14 @@ div.warning {
border-color: #CC0000;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
background-position: 5px 50%;
padding: 0.2em 0.2em 0.2em 25px;
<?php } else { ?>
background-position: 97% 50%;
padding: 0.2em 25px 0.2em 0.2em;
<?php } ?>
<?php } ?>
}
.warning h1 {
@@ -452,6 +476,14 @@ div.error {
border-color: #ff0000;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
background-position: 5px 50%;
padding: 0.2em 0.2em 0.2em 25px;
<?php } else { ?>
background-position: 97% 50%;
padding: 0.2em 25px 0.2em 0.2em;
<?php } ?>
<?php } ?>
}
div.error h1 {
@@ -666,6 +698,13 @@ ul#topmenu a.tabcaution:hover {
color: #FFFFFF;
background-color: #FF0000;
}
fieldset.caution a {
color: #FF0000;
}
fieldset.caution a:hover {
color: #ffffff;
background-color: #FF0000;
}
<?php if ($GLOBALS['cfg']['LightTabs']) { ?>
/* active tab */
@@ -1203,6 +1242,7 @@ li#li_user_preferences {
#div_table_copy,
#div_partition_maintenance,
#div_referential_integrity,
#div_table_removal,
#div_table_maintenance {
min-width: 48%;
float: <?php echo $left; ?>;