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:
cxt 2016-09-06 17:51:20 +08:00
parent 7b2ce93acc 99e63b1477
commit 8edfec258b
2 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/exercise/_student_table.html.erb
View File

@ -24,7 +24,7 @@
<%=exercise.user.show_name %> <%=exercise.user.show_name %>
</td> </td>
<td class="hworkStID student_work_<%= exercise.id%> pl15 pr10 float-none" title="学号" id="student_id_<%= exercise.id%>" style="cursor:pointer;"> <td class="hworkStID student_work_<%= exercise.id%> pl15 pr10 float-none" title="学号" id="student_id_<%= exercise.id%>" style="cursor:pointer;">
<span class="hidden fl" style="width:80px;"><%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%></span> <span class="hidden fl" style="width:55px;"><%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%></span>
</td> </td>
<td class="hworkStID student_work_<%= exercise.id%> float-none" title="班级" id="student_class_<%= exercise.id%>" style="cursor:pointer;"> <td class="hworkStID student_work_<%= exercise.id%> float-none" title="班级" id="student_class_<%= exercise.id%>" style="cursor:pointer;">
-- --

4
public/stylesheets/syllabus.css
View File

@ -566,9 +566,9 @@ a:hover.sy_btn_orange{
a.sy_class_ltitle{display: block; font-size: 14px; width: 185px; color:#888; } a.sy_class_ltitle{display: block; font-size: 14px; width: 185px; color:#888; }
a:hover.sy_class_ltitle{ color:#333;} a:hover.sy_class_ltitle{ color:#333;}
.sy_cir_grey{ .sy_cir_grey{
font-size:12px; font-size:11px;
padding: 0 10px; padding: 0 10px;
background: #dbdbdb; background: #eee;
-webkit-border-radius: 15px; -webkit-border-radius: 15px;
-moz-border-radius: 15px; -moz-border-radius: 15px;
border-radius: 15px; border-radius: 15px;