The branch, master has been updated
via bd33e411871729796cefc73881eba6d0d2bb06ce (commit)
via 959d214bdf1047b1e69c4828dfe2a349a91fcfdb (commit)
from da4b73fced1630c760640ef873728cf53041e48f (commit)
- Log -----------------------------------------------------------------
commit bd33e411871729796cefc73881eba6d0d2bb06ce
Merge: da4b73fced1630c760640ef873728cf53041e48f
959d214bdf1047b1e69c4828dfe2a349a91fcfdb
Author: Michal Čihař <[email protected]>
Date: Tue Feb 15 09:29:36 2011 +0100
Merge remote branch 'toba/master'
commit 959d214bdf1047b1e69c4828dfe2a349a91fcfdb
Author: Azhari Harahap <[email protected]>
Date: Sun Feb 13 22:55:13 2011 +0700
topmenu hover fix, left frame icon fix, submenu/topmenu2 fix, table header
on insert color fix
-----------------------------------------------------------------------
Summary of changes:
toba/css/theme_left.css.php | 6 +++++-
toba/css/theme_right.css.php | 33 ++++++++++++++++++++-------------
2 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/toba/css/theme_left.css.php b/toba/css/theme_left.css.php
index 488df06..1c24d51 100644
--- a/toba/css/theme_left.css.php
+++ b/toba/css/theme_left.css.php
@@ -169,7 +169,11 @@ div#leftframelinks a img.icon {
margin: 0;
padding: 0.2em;
border: 0.1em solid <?php echo $GLOBALS['cfg']['NaviColor'];
?>;
- background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
+ background: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+}
+
+div#leftframelinks a img.icon:hover {
+ background: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
}
/* serverlist */
diff --git a/toba/css/theme_right.css.php b/toba/css/theme_right.css.php
index f3f134a..6b9366d 100644
--- a/toba/css/theme_right.css.php
+++ b/toba/css/theme_right.css.php
@@ -652,9 +652,9 @@ ul#topmenu, ul#topmenu2, ul.tabs {
}
ul#topmenu2 {
- margin: 0.25em 0.5em 0;
- height: 2em;
- clear: both;
+ margin: 0;
+ background: <?php echo $GLOBALS['cfg']['TopMenuBgColor']; ?>;
+ border-top: 3px solid <?php echo $GLOBALS['cfg']['LabelColor']; ?>;
}
ul#topmenu li, ul#topmenu2 li {
@@ -665,6 +665,11 @@ ul#topmenu li, ul#topmenu2 li {
border-right: 1px solid #333;
}
+ul#topmenu2 li {
+ padding: 0 3px;
+ border: none;
+}
+
#topmenu img, #topmenu2 img {
vertical-align: middle;
margin-<?php echo $right; ?>: 0.1em;
@@ -723,14 +728,14 @@ ul#topmenu span.tabcaution {
color: #ff6666;
}
-/* enabled drop/empty tabs */
+/* enabled drop/empty tabs
ul#topmenu a.tabcaution {
color: #FF0000;
}
ul#topmenu a.tabcaution:hover {
color: #FFFFFF;
background-color: #FF0000;
-}
+}*/
fieldset.caution a {
color: #FF0000;
}
@@ -770,9 +775,10 @@ ul#topmenu > li {
ul#topmenu a, ul#topmenu span {
background-color: <?php echo $GLOBALS['cfg']['TopMenuBgColor']; ?>;
padding: 5px;
+ margin: 0;
/*border: 0px solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
- border-width: 1pt 1pt 0 1pt;*/
- /*-moz-border-radius: 0.4em 0.4em 0 0;
+ border-width: 1pt 1pt 0 1pt;
+ -moz-border-radius: 0.4em 0.4em 0 0;
border-radius: 0.4em 0.4em 0 0;*/
}
@@ -789,8 +795,7 @@ ul#topmenu ul li:first-child a {
/* enabled hover/active tabs */
ul#topmenu > li > a:hover,
ul#topmenu > li > .tabactive {
- margin: 0;
- /*padding: 0.2em 0.4em 0.2em 0.4em;*/
+ padding: 5px;
text-decoration: none;
}
@@ -802,7 +807,7 @@ ul#topmenu ul .tabactive {
ul#topmenu a.tab:hover,
ul#topmenu .tabactive {
background-color: <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
- /*padding: 5px;*/
+ padding: 5px;
}
ul#topmenu2 a.tab:hover,
@@ -1610,6 +1615,8 @@ iframe.IE_hack {
}
.config-form ul.tabs li {
+ background: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
+ border: 1px solid <?php echo $GLOBALS['cfg']['LabelColor']; ?>;
float: <?php echo $left; ?>;
}
@@ -1619,7 +1626,6 @@ iframe.IE_hack {
padding: 0.1em 0.4em;
white-space: nowrap;
text-decoration: none;
- border: 1px solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
border-bottom: none;
}
@@ -1631,7 +1637,8 @@ iframe.IE_hack {
}
.config-form ul.tabs li a.active {
- background-color: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
+ background-color: <?php echo $GLOBALS['cfg']['HeaderBackground']; ?>;
+ color: <?php echo $GLOBALS['cfg']['TblContentBackground']; ?>
}
.config-form fieldset {
@@ -1835,7 +1842,7 @@ table.data {
margin: 0 5px 5px 0;
}
-table.data thead a {
+table.data thead a, table.insertRowTable thead a {
color: <?php echo $GLOBALS['cfg']['TableHeaderlinkColor'];?>;
/*font-weight: normal;*/
}
hooks/post-receive
--
phpMyAdmin themes
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
