kevinli
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issues修改

This commit is contained in:
caishi 2017-08-04 16:39:12 +08:00
parent ff50a90e44
commit 2cc1727693
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/challenges/_edit_answer.html.erb
View File

@ -11,7 +11,7 @@
<ul>
<li class="clearfix">
<label class=" panel-form-label fl"> 参考答案：</label>
<div class="fl task-bg-grey panel-box-sizing panel-form-width-690 new_li" id="tpm_answer_show" style="width: 90%">
<div class="fl task-bg-grey panel-box-sizing panel-form-width-690 new_li" id="tpm_answer_show" style="width: 90%;background: #fff!important;">
<textarea style="display:none;"><%= @challenge.answer.blank? ? "无" : (@challenge.answer) %></textarea>
</div>
</li>

2
app/views/challenges/_edit_propaedeutics.html.erb
View File

@ -11,7 +11,7 @@
<ul>
<li class="clearfix">
<label class=" panel-form-label fl"> 预备知识：</label>
<div class="fl task-bg-grey panel-box-sizing panel-form-width-690 new_li" id="challenge_editorMd_propaedeutics" style="width: 90%">
<div class="fl task-bg-grey panel-box-sizing panel-form-width-690 new_li" id="challenge_editorMd_propaedeutics" style="width: 90%;background: #fff!important;">
<textarea style="display:none;"><%= @challenge.ready_knowledge.blank? ? "无" : (@challenge.ready_knowledge) %></textarea>
</div>
<!-- <div class="fl task-bg-grey panel-box-sizing panel-form-width-690 new_li" id="tpm_answer_show" style="width: 90%">

2
app/views/challenges/_edit_task_pass.html.erb
View File

@ -17,7 +17,7 @@
</li>
<li class="clearfix">
<label class="panel-form-label fl"><span class="c_red mr5">*</span>过关任务：</label>
<div class="fl task-bg-grey panel-box-sizing panel-form-width-690 new_li" id="challenge_task_pass_show" style="width: 90%;color: #888;font-size: 14px;">
<div class="fl task-bg-grey panel-box-sizing panel-form-width-690 new_li" id="challenge_task_pass_show" style="width: 90%;background: #fff!important;">
<textarea style="display:none;"><%= @challenge.task_pass %></textarea>
</div>
</li>

4
app/views/messages/_common_reply_box.html.erb
View File

@ -5,7 +5,7 @@
<span id="praise_count_<%=activity.id %>">
<%= render :partial => 'praise_tread/edu_praise', :locals => {:activity=>activity, :user_activity_id=>activity.id,:type=>"activity"} %>
</span>
<a href="javascript:void(0);"><i class="fa fa-comments-o mr5"></i>回复<span class="ml5"><%= count %></span></a>
<a href="javascript:void(0);" class="mr15"><i class="fa fa-comments-o mr5"></i>回复<span class="ml5"><%= count %></span></a>
</p>
</div>
<div class="panel-comment_item">
@ -72,7 +72,7 @@
</span>
<%= link_to(
'<i class="fa fa-comments-o mr5"></i>回复'.html_safe,
{:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => activity.class.to_s, :user_activity_id => activity.id},
{:controller => 'users' ,:action => 'reply_to',:class=>'mr15', :reply_id => comment.id, :type => activity.class.to_s, :user_activity_id => activity.id},
:remote => true,
:method => 'get',
:title => l(:button_reply)) %>

2
app/views/shixuns/_settings_show.html.erb
View File

@ -17,7 +17,7 @@
</li>
<li class="clearfix">
<label class="panel-form-label fl"><!--<span class="c_red mr5">*</span>-->简介：</label>
<div class="fl task-bg-grey panel-box-sizing panel-form-width-690 new_li" id="shixun_settings_desc" style="width: 90%;color: #888888">
<div class="fl task-bg-grey panel-box-sizing panel-form-width-690 new_li" id="shixun_settings_desc" style="width: 90%;background: #fff!important;">
<textarea style="display:none;"><%= @shixun.description %></textarea>
</div>
</li>

4
app/views/student_work/_common_reply_box.html.erb
View File

@ -4,7 +4,7 @@
<span id="praise_count_<%=activity.id %>">
<%= render :partial => 'praise_tread/edu_praise', :locals => {:activity=>activity, :user_activity_id=>activity.id,:type=>"activity"} %>
</span>
<a href="javascript:void(0);"><i class="fa fa-comments-o mr5"></i>回复<span class="ml5"><%= count %></span></a>
<a href="javascript:void(0);"class="mr15"><i class="fa fa-comments-o mr5"></i>回复<span class="ml5"><%= count %></span></a>
</p>
</div>
<div class="panel-comment_item">
@ -71,7 +71,7 @@
</span>
<%= link_to(
'<i class="fa fa-comments-o mr5"></i>回复'.html_safe,
{:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => activity.class.to_s, :user_activity_id => activity.id},
{:controller => 'users' ,:action => 'reply_to',:class=>'mr15', :reply_id => comment.id, :type => activity.class.to_s, :user_activity_id => activity.id},
:remote => true,
:method => 'get',
:title => l(:button_reply)) %>

2
app/views/users/_course_boardlist.html.erb
View File

@ -8,7 +8,7 @@
<!--<a href="#" class="link-color-grey fr">时间排序</a>-->
</p>
<div class="cl"></div>
<div class="resources user_bg_shadow" style="padding-top: 0;">
<div class="resources user_bg_shadow" style="padding: 0;width: 100%">
<!--列表内容-->
<% topics.each do |activity| %>
<div class="panel-inner-fourm">

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

@ -216,7 +216,7 @@
<!--<%# end %>-->
<!--</div>-->
<div class="passageway mt15">
<div class="passageway mt30">
<!-- <div class="hint">
<div class="pr10 color-blue play font-14">
<i class="fa fa-sort-down zhuan mr5" aria-hidden="true"></i>开始
@ -251,7 +251,7 @@
</div>
</div>
<div class="passageway mt15" id="user_homepage_course_show">
<div class="passageway mt30" id="user_homepage_course_show">
<div class="hascon">
<ul id="edu-user-tab-nav">
<li class="edu-user-tab-hover new-tab-nav">
@ -273,7 +273,7 @@
<%#= render :partial => "my_homepage_course_show" %>
</div>
<div class="favour" id="watcher_fan_list">
<div class="favour mt30" id="watcher_fan_list">
<%= render :partial => 'edu_user_watch_fan_list', :locals => {:current_user => current_user} %>
</div>
</div>

4
public/stylesheets/css/edu-user.css
View File

@ -11,7 +11,7 @@
.-task-con-data .top{width:100%;}
.-task-con-data .top .top-left{width:60%;}
.-task-con-data .top .top-left .p1{margin:5px 0;}
.-task-con-data .top .top-right{width:20%;text-align: right;}
.-task-con-data .top .top-right{width:35%;text-align: right;}
.-task-con-data .top .top-right .mynew{display:block;width:100%;}
.-task-con-data .top .top-right .mynew p a{color:#5789c8;}
.-task-con-data .top .top-right .mynew .p2{color:#ccc;}
@ -34,7 +34,7 @@
.-task-con-data .bot input{width:100%;height:40px;line-height:40px;border:none;outline:none;background:#fff;}
.-task-con-data .bot p{width: 100%; height: 25px; background: #fff;}
/*-----------------博客------------------------*/
.-task-con-int .blog,.favour{width:100%;margin-top:15px;background:#fff;}
.-task-con-int .blog,.favour{width:100%;background:#fff;}
.-task-con-int .blog .p1{width:100%;height:40px;background:#f2f2f2;line-height:40px;text-indent:10px;}
.-task-con-int .blog .p1 span{padding:0 5px;border-radius:8px;background:#e9e9eb;line-height:14px;color:#666;}
.-task-con-int .blog .p2{line-height:90px;text-align:center;}