diff --git a/app/views/challenges/_content_list.html.erb b/app/views/challenges/_content_list.html.erb index 5bd797a03..660155249 100644 --- a/app/views/challenges/_content_list.html.erb +++ b/app/views/challenges/_content_list.html.erb @@ -5,7 +5,7 @@ <%= @challenges.count %> <% end %> <% if User.current.manager_of_shixun?(@shixun) || User.current.admin? %> - 新建阶段 + 新建阶段 <% end %>
diff --git a/app/views/challenges/show.html.erb b/app/views/challenges/show.html.erb index ae33ceb3c..44e0dad41 100644 --- a/app/views/challenges/show.html.erb +++ b/app/views/challenges/show.html.erb @@ -41,7 +41,7 @@

阶段详情

- 新建阶段 + 新建阶段
diff --git a/app/views/games/_code_actions.html.erb b/app/views/games/_code_actions.html.erb index dd63290a9..a4d8d81f2 100644 --- a/app/views/games/_code_actions.html.erb +++ b/app/views/games/_code_actions.html.erb @@ -1,19 +1,19 @@
<% if @game.status == 0 %> - 评测 + 评测 <% elsif @game.status == 1 %> - 评测中.. + 评测中.. <% elsif @game.status == 2 %> <% if @had_done == 0 %> <%= link_to "下 一 关 ", {:controller => 'games', :action => "next_step", :id => @game, :myshixun_id => @myshixun}, - :class => "task-btn task-btn-blue mr15 mt8", + :class => "shixun-task-btn task-btn-blue mr15 mt8", :remote => true %> <% else %> - 退出实训 + 退出实训 <% end %> <% end %>
diff --git a/app/views/shixuns/_shixun_top.html.erb b/app/views/shixuns/_shixun_top.html.erb index d9ad0ca5b..ded77a9e0 100644 --- a/app/views/shixuns/_shixun_top.html.erb +++ b/app/views/shixuns/_shixun_top.html.erb @@ -8,14 +8,14 @@ <% if allow_shixun_exec(@shixun) %> <% if User.current.id == @shixun.user_id %> <% if @shixun.status == 1 %> - <%= link_to "重新发布", publish_shixun_path(@shixun, :type => "retry"), :class => "fr task-btn task-btn-orange font-14", :id => "challenge_begin", :remote => true %> + <%= link_to "重新发布", publish_shixun_path(@shixun, :type => "retry"), :class => "fr shixun-task-btn task-btn-orange", :id => "challenge_begin", :remote => true %> <% else %> - <%= link_to "发布实训", publish_shixun_path(@shixun), :class => "fr task-btn task-btn-orange font-14", :id => "challenge_begin", :remote => true %> + <%= link_to "发布实训", publish_shixun_path(@shixun), :class => "fr shixun-task-btn task-btn-orange", :id => "challenge_begin", :remote => true %> <% end %> <% else %> <% if @shixun.status == 1 %>
- <%= link_to "开始挑战", shixun_exec_shixun_path(@shixun), :class => "fr task-btn task-btn-orange font-14", :id => "challenge_begin", :onclick =>"$('#ajax-indicator').css('opacity','0.8').text('正在加载实训项目,请稍等……').show();" %> + <%= link_to "开始挑战", shixun_exec_shixun_path(@shixun), :class => "fr shixun-task-btn task-btn-orange", :id => "challenge_begin", :onclick =>"$('#ajax-indicator').css('opacity','0.8').text('正在加载实训项目,请稍等……').show();" %>
<% end %> <% end %> diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css index 93d805d96..e0474604a 100644 --- a/public/stylesheets/css/edu-common.css +++ b/public/stylesheets/css/edu-common.css @@ -76,7 +76,7 @@ position:absolute;left:-420px;top:0;} .col-width-2{ max-width: 20%; background: #fff; border:1px solid #e8e8e8;} .col-width-1{ max-width: 10%; background: #fff; border:1px solid #e8e8e8;} /*按钮*/ -a.task-btn{display: inline-block;border:none; padding:0 35px;color: #666;background: #e1e1e1; text-align:center;font-size: 12px; height: 35px;line-height: 35px; border-radius:3px;} +a.task-btn{display: inline-block;border:none; padding:0 35px;color: #666;background: #e1e1e1; text-align:center;font-size: 14px; height: 35px;line-height: 35px; border-radius:3px;} a:hover.task-btn {background: #c3c3c3; } a.task-btn-green{background: #29bd8b; color: #fff!important;} a:hover.task-btn-green{background: #19b17e;} diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css index 7a8e209fb..839de1076 100644 --- a/public/stylesheets/css/taskstyle.css +++ b/public/stylesheets/css/taskstyle.css @@ -249,3 +249,14 @@ a.sortArrowActiveU {background:url(../images/post_image_list.png) -17px -20px no .postSort {width:75px; float:right} .new_li ul li{ list-style-type: disc!important; } .new_li li{ margin-bottom: 0!important; } +a.shixun-task-btn { display: inline-block; + font-weight: bold; + border: none; + padding: 0 12px; + color: #666; + letter-spacing: 1px; + text-align: center; + font-size: 16px; + height: 35px; + line-height: 33px; + border-radius: 3px; }