Merge branch 'test' into dev

e/config/config.php

@@ -132,7 +132,7 @@ $ecms_config['sets']['realplayertype']=',.rm,.ra,.rmvb,.mp4,.mov,.avi,.wav,.ram,
 //------------e_public
 $public_r=array('sitename'=>'扳手 - 征集slogan',
 'newsurl'=>'/',
-'filetype'=>'|.gif|.jpg|.swf|.rar|.zip|.mp3|.wmv|.txt|.doc|',
+'filetype'=>'|.gif|.jpg|.swf|.rar|.zip|.mp3|.mp4|.wmv|.txt|.doc|',
 'filesize'=>2048,
 'relistnum'=>8,
 'renewsnum'=>100,
@@ -242,7 +242,7 @@ $public_r=array('sitename'=>'扳手 - 征集slogan',
 'gbkey_ok'=>0,
 'fbkey_ok'=>0,
 'newaddinfotime'=>0,
-'classnavs'=>'<a href=\"/news/\">新闻</a>&nbsp;|&nbsp;<a href=\"/pinlei/\">品类</a>&nbsp;|&nbsp;<a href=\"/pinpai/\">品牌</a>&nbsp;|&nbsp;<a href=\"/huandeng/\">首页幻灯</a>',
+'classnavs'=>'<a href=\"/news/\">新闻</a>&nbsp;|&nbsp;<a href=\"/pinlei/\">品类</a>&nbsp;|&nbsp;<a href=\"/pinpai/\">品牌</a>&nbsp;|&nbsp;<a href=\"/huandeng/\">首页幻灯</a>&nbsp;|&nbsp;<a href=\"/ceshi/\">测试</a>',
 'adminstyle'=>',1,2,',
 'docnewsnum'=>300,
 'openschall'=>1,
@@ -408,7 +408,7 @@ $emod_r[1]=Array('mid'=>1,
 'qeditdofunf'=>'||',
 'definfovoteid'=>0,
 'orderf'=>'',
-'sonclass'=>'|2|3|10|28|11|12|13|14|15|16|29|',
+'sonclass'=>'|2|3|10|28|11|12|13|14|15|16|29|32|',
 'tid'=>1,
 'tbname'=>'news');
 $emod_r[2]=Array('mid'=>2,

skin/default/css/banshou.css

@@ -374,15 +374,63 @@
 
 /*hot news*/
 .related-news {
-    padding: 20px 0;
-    background-color: #f9f9f9;
-    border-bottom: 1px solid #e7e7e7;
+    border-top: 1px solid #f3f3f3;
 }
-.related-news > .news-item {
-    background-color: #f9f9f9;
+.px-line {
+    height: 10px;
+    border: 1px solid #f0f0f0;
+    background-color: #f3f3f3;
 }
-.related-news > .news-item:last-child {
+.related-news .rl-tit {
+    padding: 20px 15px 0;
+    font-size: 16px;
+    font-weight: 500;
+    background-color: #fff;
+}
+.related-news .rl-tit span {
+    text-transform: uppercase;
+    padding-left: 5px;
+    color: #07c706;
+    font-size: 12px;
+    font-weight: normal;
+}
+.related-news .news-item {
     border-bottom: none;
 }
-
+.related-news .news-item a.content .tit {
+    font-size: 16px;
+}
+.related-news .rl-info {
+    position: absolute;
+    line-height: 20px;
+    font-size: 12px;
+    color: #999;
+    left: 15px;
+    bottom: 10px;
+}
+.related-news .rl-info span {
+    padding-right: 10px;
+}
+.related-news .one-picture a.content {
+    padding: 10px 110px 10px 15px;
+}
+.related-news .one-picture a.content .img-item-box .img-item {
+    top: 10px;
+}
+.related-news .one-picture a.content .img-item-box .img-item img {
+    border-radius: 3px;
+}
+.comment-box .rl-tit {
+    padding: 20px 0 10px;
+    font-size: 16px;
+    font-weight: 500;
+    background-color: #fff;
+}
+.comment-box .rl-tit span {
+    text-transform: uppercase;
+    padding-left: 5px;
+    color: #07c706;
+    font-size: 12px;
+    font-weight: normal;
+}