Merge branch 'feature/home' into develop

This commit is contained in:
Vanessa Gil 2014-09-23 12:18:32 +02:00
commit 19445e5e46
2 changed files with 5 additions and 3 deletions

View File

@ -39,7 +39,8 @@ if (tags_has_user_acl_tags()) {
// Site news ! // Site news !
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
echo '<div id="left_column_logon_ok" id="leftcolumn">'; //echo '<div id="left_column_logon_ok" id="leftcolumn">';
echo '<div style="width:50%; float:left;" id="leftcolumn">';
//////////////////NEWS BOARD///////////////////////////// //////////////////NEWS BOARD/////////////////////////////
echo '<div id="news_board">'; echo '<div id="news_board">';
@ -164,7 +165,8 @@ echo '</div>';
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// Site stats (global!) // Site stats (global!)
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
echo '<div id="right_column_logon_ok" id="rightcolumn">'; //echo '<div id="right_column_logon_ok" id="rightcolumn">';
echo '<div style="width:30%; float:left;" id="rightcolumn">';
$data = reporting_get_group_stats (); $data = reporting_get_group_stats ();
/////////////// ///////////////

View File

@ -2724,7 +2724,7 @@ table#policy_modules td * {
} }
#news_board { #news_board {
width: 750px; width: 530px;
} }
#right_column_logon_ok { #right_column_logon_ok {