jasder
/
trustieforge
forked from jacknudt/trustieforge
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

conflict

This commit is contained in:
yanxd 2014-01-16 15:52:48 +08:00
parent bacddf00d9 c4138ffe05
commit 0e3dcf88ff
3 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/stores/search.html.erb
View File

@ -23,8 +23,8 @@
</span>
</div>
<%= result.description %>
<div class="c9"> 所属分类：<%=result_come_from result%> </div>
<span class="gray">
<div class="c9 gray-color"> 所属分类：<%=result_come_from result%> </div>
<span class="gray blue-color">
下载:<%= result.downloads%>|
大小:<%= number_to_human_size(result.filesize) %>|
共享者：<a class="gray" ><%= link_to result.author%></a>|
@ -35,7 +35,7 @@
</tr>
</tbody>
</table>
<div style="height: 20px; width: 100%;"></div>
<% end %>
<div class="pagination"><%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %></div>
<script type='text/javascript'>

BIN
public/images/button/dl.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

7
public/stylesheets/nyan.css
View File

@ -427,6 +427,12 @@ table.content-text-list tbody tr td.locked, div.memo-section .locked{
text-overflow: ellipsis;
max-width: 247px;
}
.blue-color, .blue-color a{
color: rgb(109,153,178);
}
.gray-color, .gray-color a{
color: rgb(153,153,153);
}
#top_field {
max-width: 100%;
margin: 20px auto;
@ -488,3 +494,4 @@ input.blueinputbar:focus {
font-size: 16px;
color: #3333cc;
}