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

module/doc/css/common.css

@@ -60,3 +60,5 @@
 
 .main-col > .panel > .panel-body {padding-top: 20px;}
 .main-col .panel-title a.active{color: #0c64eb}
+
+#mainRow .cell{overflow: hidden auto}

module/doc/js/common.js

@@ -131,7 +131,8 @@ $(document).ready(function()
         };
 
         var resizeCols = function() {
-            var $cells = $cols.children('.panel,.cell').height('auto');
+            var cellHeight = $(window).height() - 230;
+            var $cells = $cols.children('.panel,.cell').height(cellHeight);
             if($firstCol.next('.col-spliter').css('display') != 'none')
             {
                 var bestHeight = $firstCol.height();