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

Resolve merge conflicts for upstream merge

Browse Source
This commit is contained in:
ninadsp
2010-07-29 19:17:25 +05:30
parent 2bec345a46 d0fc397fe1
commit a2f78a6d38
175 changed files with 76587 additions and 70379 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 {
@@ -651,6 +683,13 @@ 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 */
@@ -1177,7 +1216,7 @@ li#li_flush_privileges {
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 {
@@ -626,6 +658,13 @@ 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 */
@@ -1128,6 +1167,7 @@ li#li_flush_privileges {
#div_table_copy,
#div_partition_maintenance,
#div_referential_integrity,
#div_table_removal,
#div_table_maintenance {
min-width: 48%;
float: <?php echo $left; ?>;