Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/portalStaticPage

@@ -413,7 +413,7 @@ div.c_one ul li a i {
 
 div.c_one .news ul {
     float: right;
-    width: 50%;
+    width: 51%;
 }
 .news_title_content:hover span{
     color: #4A4A4A;

@@ -117,6 +117,7 @@ div.subject {
     width: 1200px;
     margin: 0 auto;
     overflow: hidden;
+    min-height:calc(100vh - 207px);
 }
 .right {
     width: 400px;