From 1271c8e5e8dfe8fa3c2b7a850e9c6d169d9bbddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 31 Jul 2019 10:09:16 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=AF=95=E4=B8=9A?= =?UTF-8?q?=E8=A6=81=E6=B1=82=E7=9A=84=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/ec_years/graduation_requirement.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 %> From f26bdbf6a904531996095d0551437d0e90ce3564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 31 Jul 2019 14:37:08 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=8D=A0=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/libraries/index.html.erb | 2 +- public/stylesheets/educoder/edu-main.css | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index 705f23e6..ddb8f8b9 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -1260,4 +1260,9 @@ html>body #ajax-indicator { position: fixed; } #trophyreturn i{ font-size: 16px!important; color: #AAAAAA; +} + +.teach_ex{ + object-fit: cover; + height: 300px; } \ No newline at end of file From fa95bf2e9266112ea4f93cb70ee8e2e968585717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 31 Jul 2019 17:21:11 +0800 Subject: [PATCH 3/6] b --- public/react/src/modules/tpm/NewHeader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 { } - {/*

  • +
  • 加入项目 -
    • */} +
    From e9b39bb9d83783764bc93e84be8202b2af62d8fc Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Thu, 1 Aug 2019 10:10:05 +0800 Subject: [PATCH 4/6] pre-wrap; --- public/stylesheets/educoder/edu-main.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index c46f94bd..ae97edc8 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -1259,4 +1259,9 @@ html>body #ajax-indicator { position: fixed; } #trophyreturn i{ font-size: 16px!important; color: #AAAAAA; +} + +/* md多空格 */ +.markdown-body p { + white-space: pre-wrap; } \ No newline at end of file From fa49ca6b1042257835df22a5375f1364e0a1577a Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Thu, 1 Aug 2019 19:08:53 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/managements/evaluate_simple.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/managements/evaluate_simple.html.erb b/app/views/managements/evaluate_simple.html.erb index 6d05aedf..ffdf5db0 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_by(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)}" %> From 9e8a54a49b4411517e639db0d1c411b80744e884 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Thu, 1 Aug 2019 19:22:07 +0800 Subject: [PATCH 6/6] 500 --- app/views/managements/evaluate_simple.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/managements/evaluate_simple.html.erb b/app/views/managements/evaluate_simple.html.erb index ffdf5db0..30e8cd39 100644 --- a/app/views/managements/evaluate_simple.html.erb +++ b/app/views/managements/evaluate_simple.html.erb @@ -36,7 +36,7 @@ <%= record.front_js %> <%= record.test_cases %> <%= format_time record.created_at %> - <% challenge = Game.find_by(record.game_id).challenge %> + <% 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)}" %>