[Phpmyadmin-git] [SCM] phpMyAdmin themes branch, master, updated. darkblue_orange-2.9-6-gf460c2c
Marc Delisle
lem9 at users.sourceforge.net
Fri Apr 22 13:14:25 CEST 2011
The branch, master has been updated
via f460c2c776b972ba6df53407225c5a689a3eaee4 (commit)
via b354509027c2365b9729c2c2ca5574087d3efb68 (commit)
from 8a623e612d27cb6c61ce50fb5aafc090008b4020 (commit)
- Log -----------------------------------------------------------------
commit f460c2c776b972ba6df53407225c5a689a3eaee4
Merge: b354509027c2365b9729c2c2ca5574087d3efb68 8a623e612d27cb6c61ce50fb5aafc090008b4020
Author: Marc Delisle <marc at infomarc.info>
Date: Fri Apr 22 07:13:28 2011 -0400
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/themes
commit b354509027c2365b9729c2c2ca5574087d3efb68
Author: Marc Delisle <marc at infomarc.info>
Date: Fri Apr 22 07:13:02 2011 -0400
Remove custom color references in themes compatible with 3.4
-----------------------------------------------------------------------
Summary of changes:
darkblue_orange/css/theme_right.css.php | 4 ++--
graphite/css/theme_left.css.php | 6 +++---
graphite/css/theme_right.css.php | 8 ++------
graphite/img/b_color.png | Bin 747 -> 0 bytes
toba/css/theme_left.css.php | 6 +++---
toba/css/theme_right.css.php | 4 ++--
6 files changed, 12 insertions(+), 16 deletions(-)
delete mode 100644 graphite/img/b_color.png
diff --git a/darkblue_orange/css/theme_right.css.php b/darkblue_orange/css/theme_right.css.php
index 837354b..f0a2d92 100644
--- a/darkblue_orange/css/theme_right.css.php
+++ b/darkblue_orange/css/theme_right.css.php
@@ -30,7 +30,7 @@ body {
padding: 0;
margin: 0.5em;
color: <?php echo $GLOBALS['cfg']['MainColor']; ?>;
- background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;
+ background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
}
<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
@@ -1404,7 +1404,7 @@ div.upload_progress_bar_outer
div.upload_progress_bar_inner
{
- background-color: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
+ background-color: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
width: 0px;
height: 12px;
margin: 1px;
diff --git a/graphite/css/theme_left.css.php b/graphite/css/theme_left.css.php
index 3b6a932..033d143 100644
--- a/graphite/css/theme_left.css.php
+++ b/graphite/css/theme_left.css.php
@@ -24,7 +24,7 @@ body {
<?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
<?php } ?>
- background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
+ background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
margin: 0;
padding: 0.2em 0.2em 0.2em 0.2em;
@@ -71,7 +71,7 @@ select#lightm_db {
div#pmalogo {
<?php //better echo $GLOBALS['cfg']['logoBGC']; ?>
- background-color: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
+ background-color: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
padding:.3em;
}
div#pmalogo,
@@ -149,7 +149,7 @@ div#left_tableList ul {
margin: 0;
padding: 0;
font-size: 80%;
- background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
+ background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
}
div#left_tableList ul ul {
diff --git a/graphite/css/theme_right.css.php b/graphite/css/theme_right.css.php
index 1010837..126aa85 100644
--- a/graphite/css/theme_right.css.php
+++ b/graphite/css/theme_right.css.php
@@ -29,7 +29,7 @@ body {
padding: 0;
margin: 0.5em;
color: <?php echo $GLOBALS['cfg']['MainColor']; ?>;
- background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;
+ background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
}
<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
@@ -997,10 +997,6 @@ li#li_user_preferences {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_tblops.png);
}
-li#li_custom_color {
- list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_color.png);
-}
-
li#li_select_fontsize {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_font.png);
}
@@ -1168,7 +1164,7 @@ div.upload_progress_bar_outer
div.upload_progress_bar_inner
{
- background-color: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
+ background-color: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
width: 0px;
height: 12px;
margin: 1px;
diff --git a/graphite/img/b_color.png b/graphite/img/b_color.png
deleted file mode 100644
index 177ec32..0000000
Binary files a/graphite/img/b_color.png and /dev/null differ
diff --git a/toba/css/theme_left.css.php b/toba/css/theme_left.css.php
index 1c24d51..4a9adf7 100644
--- a/toba/css/theme_left.css.php
+++ b/toba/css/theme_left.css.php
@@ -27,7 +27,7 @@ body {
<?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
<?php } ?>
- background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
+ background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
margin: 0;
padding: 0;
@@ -204,7 +204,7 @@ div#left_tableList ul {
margin: 0;
padding: 0;
/*font-size: 80%;*/
- background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
+ background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
}
div#left_tableList ul ul {
@@ -298,4 +298,4 @@ div#left_tableList ul ul {
ul#newtable li {
margin-top: 15px;
-}
\ No newline at end of file
+}
diff --git a/toba/css/theme_right.css.php b/toba/css/theme_right.css.php
index 6b9366d..41ead38 100644
--- a/toba/css/theme_right.css.php
+++ b/toba/css/theme_right.css.php
@@ -32,7 +32,7 @@ body {
margin: 0;
color: #333;
/*color: <?php echo $GLOBALS['cfg']['MainColor']; ?>;*/
- background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;
+ background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
}
<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
@@ -1370,7 +1370,7 @@ div.upload_progress_bar_outer
div.upload_progress_bar_inner
{
- background-color: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
+ background-color: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
width: 0px;
height: 12px;
margin: 1px;
hooks/post-receive
--
phpMyAdmin themes
More information about the Git
mailing list