Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

config/locales/tidings/zh-CN.yml

@@ -49,9 +49,9 @@
         Apply_end: "申请发布实训：%{name}"
       ApplySubject:
         System:
-          "1_end": "你提交的实训课程发布申请：%{name}，审核已通过"
+          "1_end": "你提交的实践课程发布申请：%{name}，审核已通过"
-          "2_end": "你提交的实训课程发布申请：%{name}，审核未通过<br/><span>原因：%{reason}</span>"
+          "2_end": "你提交的实践课程发布申请：%{name}，审核未通过<br/><span>原因：%{reason}</span>"
-        Apply_end: "申请发布实训课程：%{name}"
+        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"

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;}

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{

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;}
@@ -3742,5 +3742,5 @@ a.singlepublishtwo{
 }
 
 .square-main p{
-    margin-bottom: 0 !important;
+    margin-bottom: 0em;
 }