jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Conflicts:
	app/views/projects/show.html.erb
This commit is contained in:
whimlex 2015-04-17 17:08:21 +08:00
parent ab39d54b45 7340ef793c
commit 11d83a863a
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/stylesheets/project.css
View File

@ -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 {
font-size: 14px;
color: #09658C !important;
font-weight: bold;
width: 630px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin-bottom: 10px;
}
.wiki-page {font-size: 14px;color: #09658C !important; font-weight: bold;width: 630px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-bottom: 10px;}
.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;}
/*.author{*/
/*color: #FF5722;*/
/*margin-left:20px;*/