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

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

Conflicts:
	app/views/users/user_homeworks.html.erb
This commit is contained in:
cxt 2016-08-03 15:01:43 +08:00
parent cecf917764 a5fe620452
commit f262447ff1
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/users/user_homeworks.html.erb
View File

@ -56,11 +56,13 @@
<%=render :partial => 'homework_repository_list', :locals => {:homeworks => @homeworks,:type=>'1',:is_import => 0,:property => @property,:search=>''} %> <%=render :partial => 'homework_repository_list', :locals => {:homeworks => @homeworks,:type=>'1',:is_import => 0,:property => @property,:search=>''} %>
</div> </div>
<div class="pages"> <div style="text-align:center;">
<div class="pages" style="width:auto; display:inline-block;">
<ul id="homework_pository_ref_pages"> <ul id="homework_pository_ref_pages">
<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%> <%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
</ul> </ul>
</div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
</div> </div>
</div>
</div>

1
public/stylesheets/css/public.css
View File

@ -527,6 +527,7 @@ a.list-title{ font-size:14px; font-weight: bold; color:#000; white-space:nowrap;
a.pages-big{ width:50px;} a.pages-big{ width:50px;}
.pages .active{ background-color:#3b94d6; border:1px solid #3b94d6; color:#fff;} .pages .active{ background-color:#3b94d6; border:1px solid #3b94d6; color:#fff;}
.pages{width:330px; margin:20px auto 10px;} .pages{width:330px; margin:20px auto 10px;}
.pages li {display:inline-block;}
/*课程列表界面样式*/ /*课程列表界面样式*/
a.course-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; width:590px;} a.course-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; width:590px;}