diff --git a/app/views/ec_years/graduation_requirement.html.erb b/app/views/ec_years/graduation_requirement.html.erb index eab92924..76833188 100644 --- a/app/views/ec_years/graduation_requirement.html.erb +++ b/app/views/ec_years/graduation_requirement.html.erb @@ -22,7 +22,7 @@

指标点 - 内容 + 内容 <% if @template_major %> diff --git a/app/views/libraries/index.html.erb b/app/views/libraries/index.html.erb index f5bf570c..293c042d 100644 --- a/app/views/libraries/index.html.erb +++ b/app/views/libraries/index.html.erb @@ -1,4 +1,4 @@ - +

diff --git a/app/views/managements/evaluate_simple.html.erb b/app/views/managements/evaluate_simple.html.erb index 6d05aedf..30e8cd39 100644 --- a/app/views/managements/evaluate_simple.html.erb +++ b/app/views/managements/evaluate_simple.html.erb @@ -36,7 +36,8 @@ <%= record.front_js %> <%= record.test_cases %> <%= format_time record.created_at %> - <%= record.shixun.try(:exec_time) %> + <% challenge = Game.find(record.game_id).challenge %> + <%= challenge.try(:exec_time) %> <%= record.shixun.try(:identifier) %> <%= link_to record.shixun.try(:name), task_path(record.game), :target => "_blank", :title => "#{record.shixun.try(:name)}" %> diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 1711f17a..31e6d8db 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -526,9 +526,9 @@ class NewHeader extends Component { } - {/*

  • +
  • 加入项目 -
  • */} +
    diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index 705f23e6..94d38790 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -1260,4 +1260,13 @@ html>body #ajax-indicator { position: fixed; } #trophyreturn i{ font-size: 16px!important; color: #AAAAAA; +} + +/* md多空格 */ +.markdown-body p { + white-space: pre-wrap; +} +.teach_ex{ + object-fit: cover; + height: 300px; } \ No newline at end of file