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

This commit is contained in:
huang 2015-09-17 13:00:30 +08:00
parent 7cdebab5e5 d21dce566f
commit cfcf1f8103
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/news/_project_news.html.erb
View File

@ -1,3 +1,9 @@
<style type="text/css">
span{
word-break:break-all;
word-wrap:break-word;
}
</style>
<%
btn_tips = l(:label_news_new)
label_tips = l(:label_news)

11
public/stylesheets/project.css
View File

@ -108,24 +108,26 @@ a:hover.btn_free{ background:#d63502;}
/*vertical-align: top;*/
/*}*/
.invitations-records td.email {
max-width: 150px;
max-width: 200px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
width:200px;
}
.invitations-records td.text-name {
max-width: 150px;
max-width: 200px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
width: 150px;
width: 200px;
}
.invitations-records td.text-name span.unactive {
max-width: 150px;
max-width: 200px;
color: #888;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
width: 200px;
}
.invitations-records td.text-status {
max-width: 290px;
@ -134,7 +136,6 @@ a:hover.btn_free{ background:#d63502;}
text-overflow: ellipsis;
color: #7CAD37;
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
width: 290px;
}
.invitations-records td.text-time {
max-width: 80px;