From 2bfa36d0868c3f1dfe21a87b7bb060dc7a934c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 22 Aug 2019 14:54:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/educoder/edu-all.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 789789171..1278ef618 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -3742,5 +3742,5 @@ a.singlepublishtwo{ } .square-main p{ - margin-bottom: 0 !important; + margin-bottom: 0em; } \ No newline at end of file From c09f699f0a9ae369f03ea060f96e5fc4854cc3fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 22 Aug 2019 14:58:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/public/css/edu-all.css | 2 +- public/stylesheets/educoder/edu-all.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css index b57d4db42..c8a4aeaf6 100644 --- a/public/react/public/css/edu-all.css +++ b/public/react/public/css/edu-all.css @@ -121,7 +121,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px} background: #000000; border: 1px solid #fff; border-radius: 3px; - font-size: 14px; + font-size: 12px; opacity: 0.56; background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;} .tag-orange{position: absolute;right: 0px;top:12px;} diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 1278ef618..4f6dadcf9 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -123,7 +123,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px} background: #000000; border: 1px solid #fff; border-radius: 3px; - font-size: 14px; + font-size: 12px; opacity: 0.56; background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;} .tag-orange{position: absolute;right: 0px;top:12px;} From 87250ea5ff016813630f585ef52c9201537b1bb1 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Thu, 22 Aug 2019 15:02:28 +0800 Subject: [PATCH 3/4] modify tiding subject message --- config/locales/tidings/zh-CN.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/tidings/zh-CN.yml b/config/locales/tidings/zh-CN.yml index 347b0139a..e6e8e676d 100644 --- a/config/locales/tidings/zh-CN.yml +++ b/config/locales/tidings/zh-CN.yml @@ -49,9 +49,9 @@ Apply_end: "申请发布实训：%{name}" ApplySubject: System: - "1_end": "你提交的实训课程发布申请：%{name}，审核已通过" - "2_end": "你提交的实训课程发布申请：%{name}，审核未通过
原因：%{reason}" - Apply_end: "申请发布实训课程：%{name}" + "1_end": "你提交的实践课程发布申请：%{name}，审核已通过" + "2_end": "你提交的实践课程发布申请：%{name}，审核未通过
原因：%{reason}" + Apply_end: "申请发布实践课程：%{name}" TrialAuthorization: System: "1_end": "你提交的试用授权申请，审核已通过" @@ -61,7 +61,7 @@ Course: Delete_end: "你删除了课堂：%s" Shixun_end: "你创建了实训：%s" - Subject_end: "你创建了实训课程：%s" + Subject_end: "你创建了实践课程：%s" ArchiveCourse_end: "你的课堂已经归档：%s" JournalsForMessage: Mentioned_end: "@了你：%s" From 28d779d173e883f05063398dc8260d318a08389d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 22 Aug 2019 15:02:47 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/component/TPMright.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/tpm/component/TPMright.css b/public/react/src/modules/tpm/component/TPMright.css index b0f8315e6..41b87c0d0 100644 --- a/public/react/src/modules/tpm/component/TPMright.css +++ b/public/react/src/modules/tpm/component/TPMright.css @@ -45,12 +45,12 @@ } .newedboxheight{ max-height:204px; - overflow-y: auto; + overflow-y: hidden; } .newminheight{ /*max-height: 670px;*/ max-height: 300px; - overflow: auto; + overflow-y: auto; } .delSubentry{