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

Merge branch 'dev-homepage-revision' of http://git.trustie.net/jacknudt/trustieforge into dev-homepage-revision

This commit is contained in:
Jasder 2019-10-23 10:11:05 +08:00
parent 9b0c37a9bd c7f172940c
commit 6fbbc24828
8 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/homes/_news_list.html.erb
View File

@ -13,6 +13,5 @@
</div> </div>
</li> </li>
<% end %> <% end %>
<ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
<%= pagination_links_full @obj_pages, @obj_count ,:per_page_links => true, :remote => true, :flag => true, :is_new => true %>
</ul>

5
app/views/homes/news.html.erb
View File

@ -7,4 +7,9 @@
<ul class="introduce_a_list"> <ul class="introduce_a_list">
<%= render :partial => 'news_list'%> <%= render :partial => 'news_list'%>
</ul> </ul>
<div class="pages" style="text-align: center">
<ul class="inline mt30 mb40">
<%= pagination_links_full @obj_pages, @obj_count ,:per_page_links => true, :remote => true, :flag => true, :is_new => true %>
</ul>
</div>
</div> </div>

BIN
public/images/dynamic_new/0fa89edb-f95c-4940-adf3-dc3665fdc451.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
public/images/dynamic_new/11b03c4c-25c8-4144-bf7e-b19d5f4427e6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
public/images/dynamic_new/45b2e3b9-3eec-40b9-8926-2a706fd53420.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
public/images/dynamic_new/7735199b-650b-426d-967c-6704f8db20bb.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
public/images/dynamic_new/8e296756-f6b4-4d60-a39c-9e712195b501.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

2
public/stylesheets/css/introduce.css
View File

@ -111,7 +111,7 @@ body{
text-align: center; text-align: center;
} }
/*行业动态-更多*/ /*行业动态-更多*/
.introduce_a_list li{ .introduce_a_list > li{
display: flex; display: flex;
padding:25px 0px; padding:25px 0px;
border-bottom:1px solid #EAEAEA ; border-bottom:1px solid #EAEAEA ;