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

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
huang 2016-10-15 14:21:03 +08:00
parent c94f986ba2 0c481de79d
commit b89484c344
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/files/_attachment_history_popub.html.erb
View File

@ -10,7 +10,7 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<th ><p class="popup_ziyuan_title"><%= @attachment.filename %><span class="muban_icons_blue ml5">当前版本</span></p></th> <th ><p class="popup_ziyuan_title fl"><%= @attachment.filename %></p><span class="muban_icons_blue ml5">当前版本</span></th>
<th><%= @attachment.downloads %></th> <th><%= @attachment.downloads %></th>
<th><%= @attachment.try(:quotes).to_i %></th> <th><%= @attachment.try(:quotes).to_i %></th>
<th><%= format_time(@attachment.created_on) %></th> <th><%= format_time(@attachment.created_on) %></th>

3
public/stylesheets/css/project.css
View File

@ -660,6 +660,3 @@ a:hover.sy_btn_pink{ background: #e64c4c;}
} }
.sy_class_titbox{margin-bottom:5px; padding-top:10px; } .sy_class_titbox{margin-bottom:5px; padding-top:10px; }
/*项目历史版本删除功能*/
.popup_ziyuan_title{ display: block; margin-left: 10px; text-align: left;width:360px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}

3
public/stylesheets/css/public.css
View File

@ -1512,3 +1512,6 @@ a.syllabusbox_a_blue{
/*20160912问卷调查*/ /*20160912问卷调查*/
.dash-block {border:1px dashed #ddd;} .dash-block {border:1px dashed #ddd;}
/*历史版本删除功能*/
.popup_ziyuan_title{ display: block; margin-left: 10px; text-align: left;width:360px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}