Merge remote branch 'toba/master'

This commit is contained in:
Michal Čihař
2011-02-15 09:29:36 +01:00
2 changed files with 25 additions and 14 deletions

View File

@@ -169,7 +169,11 @@ div#leftframelinks a img.icon {
margin: 0; margin: 0;
padding: 0.2em; padding: 0.2em;
border: 0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>; 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 */ /* serverlist */

View File

@@ -652,9 +652,9 @@ ul#topmenu, ul#topmenu2, ul.tabs {
} }
ul#topmenu2 { ul#topmenu2 {
margin: 0.25em 0.5em 0; margin: 0;
height: 2em; background: <?php echo $GLOBALS['cfg']['TopMenuBgColor']; ?>;
clear: both; border-top: 3px solid <?php echo $GLOBALS['cfg']['LabelColor']; ?>;
} }
ul#topmenu li, ul#topmenu2 li { ul#topmenu li, ul#topmenu2 li {
@@ -665,6 +665,11 @@ ul#topmenu li, ul#topmenu2 li {
border-right: 1px solid #333; border-right: 1px solid #333;
} }
ul#topmenu2 li {
padding: 0 3px;
border: none;
}
#topmenu img, #topmenu2 img { #topmenu img, #topmenu2 img {
vertical-align: middle; vertical-align: middle;
margin-<?php echo $right; ?>: 0.1em; margin-<?php echo $right; ?>: 0.1em;
@@ -723,14 +728,14 @@ ul#topmenu span.tabcaution {
color: #ff6666; color: #ff6666;
} }
/* enabled drop/empty tabs */ /* enabled drop/empty tabs
ul#topmenu a.tabcaution { ul#topmenu a.tabcaution {
color: #FF0000; color: #FF0000;
} }
ul#topmenu a.tabcaution:hover { ul#topmenu a.tabcaution:hover {
color: #FFFFFF; color: #FFFFFF;
background-color: #FF0000; background-color: #FF0000;
} }*/
fieldset.caution a { fieldset.caution a {
color: #FF0000; color: #FF0000;
} }
@@ -770,9 +775,10 @@ ul#topmenu > li {
ul#topmenu a, ul#topmenu span { ul#topmenu a, ul#topmenu span {
background-color: <?php echo $GLOBALS['cfg']['TopMenuBgColor']; ?>; background-color: <?php echo $GLOBALS['cfg']['TopMenuBgColor']; ?>;
padding: 5px; padding: 5px;
margin: 0;
/*border: 0px solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>; /*border: 0px solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
border-width: 1pt 1pt 0 1pt;*/ border-width: 1pt 1pt 0 1pt;
/*-moz-border-radius: 0.4em 0.4em 0 0; -moz-border-radius: 0.4em 0.4em 0 0;
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 */ /* enabled hover/active tabs */
ul#topmenu > li > a:hover, ul#topmenu > li > a:hover,
ul#topmenu > li > .tabactive { ul#topmenu > li > .tabactive {
margin: 0; padding: 5px;
/*padding: 0.2em 0.4em 0.2em 0.4em;*/
text-decoration: none; text-decoration: none;
} }
@@ -802,7 +807,7 @@ ul#topmenu ul .tabactive {
ul#topmenu a.tab:hover, ul#topmenu a.tab:hover,
ul#topmenu .tabactive { ul#topmenu .tabactive {
background-color: <?php echo $GLOBALS['cfg']['MainBackground']; ?>; background-color: <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
/*padding: 5px;*/ padding: 5px;
} }
ul#topmenu2 a.tab:hover, ul#topmenu2 a.tab:hover,
@@ -1610,6 +1615,8 @@ iframe.IE_hack {
} }
.config-form ul.tabs li { .config-form ul.tabs li {
background: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
border: 1px solid <?php echo $GLOBALS['cfg']['LabelColor']; ?>;
float: <?php echo $left; ?>; float: <?php echo $left; ?>;
} }
@@ -1619,7 +1626,6 @@ iframe.IE_hack {
padding: 0.1em 0.4em; padding: 0.1em 0.4em;
white-space: nowrap; white-space: nowrap;
text-decoration: none; text-decoration: none;
border: 1px solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
border-bottom: none; border-bottom: none;
} }
@@ -1631,7 +1637,8 @@ iframe.IE_hack {
} }
.config-form ul.tabs li a.active { .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 { .config-form fieldset {
@@ -1835,7 +1842,7 @@ table.data {
margin: 0 5px 5px 0; margin: 0 5px 5px 0;
} }
table.data thead a { table.data thead a, table.insertRowTable thead a {
color: <?php echo $GLOBALS['cfg']['TableHeaderlinkColor'];?>; color: <?php echo $GLOBALS['cfg']['TableHeaderlinkColor'];?>;
/*font-weight: normal;*/ /*font-weight: normal;*/
} }