The branch, master has been updated via 1f4d68ee62a69f8a37b41de6f21e896d9baf3304 (commit) via 538cb2e7ce48f82fa872a4b7c6fe5182a7586e73 (commit) from 4d1aaea80b27aef30d7e3581655ee6e890ffab93 (commit)

- Log ----------------------------------------------------------------- commit 1f4d68ee62a69f8a37b41de6f21e896d9baf3304 Merge: 4d1aaea80b27aef30d7e3581655ee6e890ffab93 538cb2e7ce48f82fa872a4b7c6fe5182a7586e73 Author: Michal Čihař mcihar@novell.com Date: Tue Feb 8 20:09:40 2011 +0100

Merge remote branch 'toba/master'

commit 538cb2e7ce48f82fa872a4b7c6fe5182a7586e73 Author: Azhari Harahap blackarazi@gmail.com Date: Tue Feb 8 12:55:36 2011 +0700

fix more button issue

-----------------------------------------------------------------------

Summary of changes: toba/css/theme_right.css.php | 15 ++++++++++----- toba/layout.inc.php | 29 +++++++++++++++-------------- 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/toba/css/theme_right.css.php b/toba/css/theme_right.css.php index 71503a5..f3f134a 100644 --- a/toba/css/theme_right.css.php +++ b/toba/css/theme_right.css.php @@ -77,7 +77,7 @@ dfn:hover { }

th { - font-weight: normal; + font-weight: bold; color: <?php echo $GLOBALS['cfg']['ThColor']; ?>; background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>; } @@ -134,7 +134,7 @@ table { table caption, table th, table td { - padding: 5px; + padding: 3px; margin: 0; vertical-align: top; } @@ -684,6 +684,7 @@ ul#topmenu ul a { }

ul#topmenu .submenu { + display: none; position: relative; }

@@ -1830,9 +1831,13 @@ fieldset .disabled-field td { text-decoration: none; }

+table.data { + margin: 0 5px 5px 0; +} + table.data thead a { - color: <?php echo $GLOBALS['cfg']['HeaderColor'];?>; - font-weight: normal; + color: <?php echo $GLOBALS['cfg']['TableHeaderlinkColor'];?>; + /*font-weight: normal;*/ }

table.data a { @@ -1840,7 +1845,7 @@ table.data a { }

th a { - color: <?php echo $GLOBALS['cfg']['TableHeaderlinkColor']; ?>; + color: <?php echo $GLOBALS['cfg']['TopMenuColor']; ?>; }

th label, .name, tr.odd th, tr.even th { diff --git a/toba/layout.inc.php b/toba/layout.inc.php index 9ca6123..984f67c 100644 --- a/toba/layout.inc.php +++ b/toba/layout.inc.php @@ -14,18 +14,18 @@ * Define color here */

-$color['one'] = '#D0E7F4'; -$color['two'] = '#4284B5'; -$color['three'] = '#F8FAFC'; -$color['four'] = '#0000FF'; -$color['five'] = '#000000'; -$color['six'] = '#FFFFFF'; -$color['seven'] = '#999999'; -$color['eight'] = '#3D7BC9'; -$color['nine'] = '#FEFEFE'; -$color['ten'] = '#333333'; - - +$color['one'] = '#D0E7F4'; +$color['two'] = '#4284B5'; +$color['three'] = '#F8FAFC'; +$color['four'] = '#0000FF'; +$color['five'] = '#000000'; +$color['six'] = '#FFFFFF'; +$color['seven'] = '#999999'; +$color['eight'] = '#386bcd'; +$color['nine'] = '#FEFEFE'; +$color['ten'] = '#333333'; +$color['eleven'] = '#F5FAFC'; +$color['twelve'] = '#7fcfe9';

/** * navi frame @@ -95,7 +95,7 @@ $GLOBALS['cfg']['ThColor'] = $color['nine']; // table data row background $GLOBALS['cfg']['BgOne'] = $color['one']; // 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'];

// tableheader link color -$GLOBALS['cfg']['TableHeaderlinkColor'] = '#F5FAFC'; +$GLOBALS['cfg']['TopMenuColor'] = $color['eleven']; +$GLOBALS['cfg']['TableHeaderlinkColor'] = $color['one'];

$GLOBALS['cfg']['TableLinkColor'] = $color['eight'];

hooks/post-receive