Merge remote branch 'toba/master'

This commit is contained in:
Michal Čihař
2011-02-08 20:09:40 +01:00
2 changed files with 25 additions and 19 deletions

View File

@@ -77,7 +77,7 @@ dfn:hover {
} }
th { th {
font-weight: normal; font-weight: bold;
color: <?php echo $GLOBALS['cfg']['ThColor']; ?>; color: <?php echo $GLOBALS['cfg']['ThColor']; ?>;
background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>; background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
} }
@@ -134,7 +134,7 @@ table {
table caption, table caption,
table th, table th,
table td { table td {
padding: 5px; padding: 3px;
margin: 0; margin: 0;
vertical-align: top; vertical-align: top;
} }
@@ -684,6 +684,7 @@ ul#topmenu ul a {
} }
ul#topmenu .submenu { ul#topmenu .submenu {
display: none;
position: relative; position: relative;
} }
@@ -1830,9 +1831,13 @@ fieldset .disabled-field td {
text-decoration: none; text-decoration: none;
} }
table.data {
margin: 0 5px 5px 0;
}
table.data thead a { table.data thead a {
color: <?php echo $GLOBALS['cfg']['HeaderColor'];?>; color: <?php echo $GLOBALS['cfg']['TableHeaderlinkColor'];?>;
font-weight: normal; /*font-weight: normal;*/
} }
table.data a { table.data a {
@@ -1840,7 +1845,7 @@ table.data a {
} }
th a { th a {
color: <?php echo $GLOBALS['cfg']['TableHeaderlinkColor']; ?>; color: <?php echo $GLOBALS['cfg']['TopMenuColor']; ?>;
} }
th label, .name, tr.odd th, tr.even th { th label, .name, tr.odd th, tr.even th {

View File

@@ -14,18 +14,18 @@
* Define color here * Define color here
*/ */
$color['one'] = '#D0E7F4'; $color['one'] = '#D0E7F4';
$color['two'] = '#4284B5'; $color['two'] = '#4284B5';
$color['three'] = '#F8FAFC'; $color['three'] = '#F8FAFC';
$color['four'] = '#0000FF'; $color['four'] = '#0000FF';
$color['five'] = '#000000'; $color['five'] = '#000000';
$color['six'] = '#FFFFFF'; $color['six'] = '#FFFFFF';
$color['seven'] = '#999999'; $color['seven'] = '#999999';
$color['eight'] = '#3D7BC9'; $color['eight'] = '#386bcd';
$color['nine'] = '#FEFEFE'; $color['nine'] = '#FEFEFE';
$color['ten'] = '#333333'; $color['ten'] = '#333333';
$color['eleven'] = '#F5FAFC';
$color['twelve'] = '#7fcfe9';
/** /**
* navi frame * navi frame
@@ -95,7 +95,7 @@ $GLOBALS['cfg']['ThColor'] = $color['nine'];
// table data row background // table data row background
$GLOBALS['cfg']['BgOne'] = $color['one']; $GLOBALS['cfg']['BgOne'] = $color['one'];
// table data row background, alternate // table data row background, alternate
$GLOBALS['cfg']['BgTwo'] = '#F5FAFC'; $GLOBALS['cfg']['BgTwo'] = $color['eleven'];
/** /**
@@ -112,7 +112,8 @@ $GLOBALS['cfg']['linkColor'] = '#21759B';
$GLOBALS['cfg']['LabelColor'] = $color['ten']; $GLOBALS['cfg']['LabelColor'] = $color['ten'];
// tableheader link color // tableheader link color
$GLOBALS['cfg']['TableHeaderlinkColor'] = '#F5FAFC'; $GLOBALS['cfg']['TopMenuColor'] = $color['eleven'];
$GLOBALS['cfg']['TableHeaderlinkColor'] = $color['one'];
$GLOBALS['cfg']['TableLinkColor'] = $color['eight']; $GLOBALS['cfg']['TableLinkColor'] = $color['eight'];