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
commit 6fbbc24828
8 changed files with 8 additions and 4 deletions

View File

@ -13,6 +13,5 @@
</div>
</li>
<% 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>

View File

@ -7,4 +7,9 @@
<ul class="introduce_a_list">
<%= render :partial => 'news_list'%>
</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>

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

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