Merge branch 'master' of github.com:easysoft/zentaopms

module/block/css/dashboard.css

@@ -1,4 +1,3 @@
 .block-statistic .nav-stacked {overflow: auto; max-height: 220px;}
 .nav > li > .btn {padding: 0 5px; line-height: 24px; margin: 3px; color: #3C4353;}
-.dashboard .panel-body {max-height: 400px;overflow: auto;}
-  
+.dashboard .panel-body {max-height: 400px; overflow: auto;}

module/block/view/dashboard.html.php

@@ -18,7 +18,7 @@ $useGuest = $this->app->user->account == 'guest';
 ?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <div class='dashboard' id='dashboard' data-confirm-remove-block='<?php  echo $lang->block->confirmRemoveBlock;?>'>
-  <div>
+  <div class="row">
     <div class='col-md-8 col-main'>
       <?php foreach($longBlocks as $index => $block):?>
       <?php if(isset($config->block->closed) and strpos(",{$config->block->closed},", ",{$block->source}|{$block->block},") !== false) continue;?>