Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

Conflicts:
	app/views/projects/show.html.erb

public/stylesheets/project.css

@@ -470,16 +470,8 @@ img.ui-datepicker-trigger {
 .wiki_page_con{ border-bottom:1px dashed #CCC; margin-bottom:10px; padding-bottom:10px;}
 #wiki_new_box{ display:none;}
 /*wiki显示附加*/
-.wiki-page {
+.wiki-page {font-size: 14px;color: #09658C !important; font-weight: bold;width: 630px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-bottom: 10px;}
-    font-size: 14px;
+.wiki_con_tit{font-size: 14px;color: #09658C !important; font-weight: bold;width: 630px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-bottom: 10px;}
-    color: #09658C !important;
-    font-weight: bold;
-    width: 630px;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    margin-bottom: 10px;
-}
 /*.author{*/
     /*color: #FF5722;*/
     /*margin-left:20px;*/