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

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

This commit is contained in:
daiao 2017-02-23 10:29:21 +08:00
parent 7e04e67a5b e1be2fda81
commit b36c249a6b
4 changed files with 2649 additions and 2682 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/projects/_act_training_tasks.html.erb
View File

@ -54,6 +54,11 @@
<div class="cl"></div>
</div>
<%=render :partial =>"users/intro_content", :locals=>{:user_activity_id => user_activity_id, :content => activity.description} %>
<a href="#" class="task-display-span bBlue mt10">提交测评。</a>
<span class="task-display-span alert-blue mt10">当前任务正在后台测评中，稍后将显示您的任务完成情况......</span>
<span class="task-display-span b_dgrey mt10">本任务已通过测评，处于关闭状态。</span>
<div id="intro_content_show_<%= user_activity_id %>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
<div id="intro_content_hide_<%= user_activity_id %>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
<div class="cl"></div>

5306
db/schema.rb
View File

File diff suppressed because it is too large Load Diff

18
public/stylesheets/css/common.css
View File

@ -144,7 +144,7 @@ a.c_blue{ color:#3b94d6;}
a.c_eblue{color: #3784D3}
a.c_setting_blue{color: #0781B4}
a.c_dblue{ color:#09658c;}
a:hover.c_dblue{ color:#297fb8;}
a:hover.c_dblue{ color:#2788d0;}
a.c_white{ color:#fff;}
input.c_white { color:#fff}
a.c_dorange{ color:#fd6e2a;}
@ -201,7 +201,7 @@ a:hover.c_grey{ color:#333;}
.fontBlue {color:#3498db;}
span.newsBlack {color:#4b4b4b; font-size:13px; font-weight:bold}
a.underline {text-decoration:underline;}
a.fontBlue {color:#297fb8;}
a.fontBlue {color:#2788d0;}
.fontBlue2 {color:#3b94d6 !important;}
a.fontGrey {color:#cecece;}
a.fontGrey2 {color:#888888;}
@ -211,11 +211,11 @@ a.link-black:hover {color:#3b94d6;}
a.link-blue {color:#3b94d6;}
a.linkOrange {color:#ff7143;}
a.linkBlue {color:#3b94d6;}
a.linkBlue:hover {color:#297fb8;}
a.linkBlue:hover {color:#2788d0;}
a.linkBlue2 {color:#3498db;}
a.linkBlue2:hover {color:#297fb8;}
a.linkBlue2:hover {color:#2788d0;}
a.buttonBlue {background-color:#3b94d6;}
a.buttonBlue:hover {background-color:#297fb8;}
a.buttonBlue:hover {background-color:#2788d0;}
a.linkGrey {color:#484848;}
a.linkGrey:hover {color:#3b94d6;}
a.linkGrey2 {color:#888888;}
@ -223,7 +223,7 @@ a.linkGrey2:hover {color:#484848;}
a.linkGrey3 {color:#484848;}
a.linkGrey3:hover {color:#000000;}
a.linkGrey4 {color:#484848;}
a.linkGrey4:hover {color:#297fb8;}
a.linkGrey4:hover {color:#2788d0;}
a.linkGrey5 {color:#484848;}
a.linkGrey5:hover {color:#3498db !important;}
a.linkGrey6 {color:#484848 !important;}
@ -231,7 +231,7 @@ a.linkGrey6:hover {color:#ffffff !important;}
a.linkGrey7 {color:#888888;}
a.linkGrey7:hover {color:#3b94d6;}
a.bBlue {background-color:#3498db;}
a.bBlue:hover {background-color:#297fb8;}
a.bBlue:hover {background-color:#2788d0;}
a.bGreen {background-color:#60b25e;}
a.bGreen:hover {background-color:#51a74f;}
a.submit_btn {border:1px solid #3498db; padding:3px 10px; border-radius:3px; color:#3498db;}
@ -240,7 +240,7 @@ a.link_file_a{ background:url(/images/pic_file.png) 0 2px no-repeat; padding-lef
a:hover.link_file_a{ background:url(/images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
a.link_file_a2{ background:url(/images/pic_file.png) 0 -15px no-repeat; padding-left: 20px;}
a.submit_btn2 {background-color: #3b94d6; padding: 3px 5px; color: #ffffff;}
a.submit_btn2:hover {background-color: #297fb8;}
a.submit_btn2:hover {background-color: #2788d0;}
/****翻页***/
.wlist{float:right;}
.wlist li{float:left;}
@ -452,4 +452,4 @@ a:hover.btn-blue{background: #2788d0; color: #fff;}
.sy_popup_con02{ margin:30px auto 0; font-size:14px; text-align:center; width:360px;}
.sy_popup_con02 ul li p{ margin-bottom:15px; text-align:center; font-size:14px; color:#616161;}
.sy_popup_con02 a{ margin:0 auto;}
#sy_popup_box{ width:460px; background:#fff; padding-bottom:30px; border-radius:5px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);}
#sy_popup_box{ width:460px; background:#fff; padding-bottom:30px; border-radius:5px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);}

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

@ -672,3 +672,5 @@ a:hover.pro-fenzhi-a{color:#3b94d6;}
span.task-linebtn-green{color:#59af48; border: 1px solid #59af48;font-size: 12px; padding: 0 5px; border-radius: 3px;line-height: 14px;}
.issues-table select.select-w50{ width: 50px;}
span.task-step{ color:#ee4a20;font-style: italic; font-weight:bold; font-size:14px;}
.task-display-span,a.task-display-span{ display:inline-block; border-radius:3px; width: 100%; text-align: center; color: #fff; padding: 5px 0; }
.task-bgrey{background:#ccc;}