Merge branch 'dev_local' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_local

app/views/courses/settings/_choose_course_group.html.erb

@@ -12,7 +12,7 @@
       <span class="color-red none" style="margin-left: 45px" id="choose_course_group_notice">请先选择一个分班</span>
   <% end %>
 </div>
-<div class="task-popup-submit02 clearfix" style=" margin-top: -5px;margin-left: -13px;">
+<div class="task-popup-submit02 clearfix" style=" margin-top: -20px;margin-left: -13px;">
   <a href="javascript:void(0);" id="choose_course_group_submit" class="task-btn task-btn-orange fr sure newtaskBtn">确定</a>
   <a href="javascript:void(0);" class="pop_close task-btn fr mr10 cancel newtask-mr10btn">取消</a>
 </div>

app/views/layouts/base_courses.html.erb

@@ -16,7 +16,11 @@
   <%= javascript_heads %>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'css/common', 'css/public', 'css/ketang', 'css/structure', 'prettify', 'css/courses', 'css/popup', 'css/syllabus', 'css/moduel', 'css/font-awesome', 'css/contest', 'css/font-awesome', 'css/edu-class', 'css/edu-popup', 'educoder/magic-check', 'css/edu-common', "css/edu-public", 'educoder/edu-main', 'educoder/edu-all' %>
+  <!--'css/contest','prettify', 'css/courses', 'css/moduel','css/structure','css/syllabus', 'css/edu-popup',  'css/ketang',-->
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'css/common', 'css/public',
+                          'css/font-awesome', 'css/edu-class','educoder/magic-check', 'css/edu-common',
+                          "css/edu-public", 'educoder/edu-main', 'educoder/edu-all' %>
+
   <%= javascript_include_tag "course", "avatars", "header", "attachments", 'prettify', "edu/application", "edu/course", 'edu/homework', 'jquery.datetimepicker.js', 'educoder/edu_application', 'educoder/edu_file', 'educoder/edu_graduation' %>
   <%= yield :header_tags -%>
   <!-- MathJax的配置 -->

app/views/layouts/base_edu.html.erb

@@ -9,8 +9,9 @@
   <%= favicon %>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
+  <!-- 'css/ketang',-->
   <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2', 'css/structure','css/edu-common', 'css/edu-public','css/taskstyle',
-                           'css/font-awesome', 'css/edu-class', 'css/edu-user', 'css/edu-popup', 'css/edu-forum', 'css/ketang',
+                           'css/font-awesome', 'css/edu-class', 'css/edu-user', 'css/edu-popup', 'css/edu-forum',
                            'css/edu-subject', 'educoder/magic-check', "css/edu-admin", 'prettify.css','educoder/edu-main',
                            'educoder/edu-all' %>
   <%= javascript_heads %>

public/stylesheets/css/courses.css

@@ -28,7 +28,6 @@ a:hover.DropBtn{background: url(../images/homepage_icon.png) -125px -370px no-re
 a.link_file{ background:url(/images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
 a:hover.link_file{ background:url(/images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
 a.FilesName{ max-width:540px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
-a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
 .ProResultUl span { display:block; float:left;}
 .ProResultUl>div{  line-height:35px;  border-bottom:1px solid #dddddd; }
 .DateBorder{border:1px solid #d9d9d9; border-left:none; padding:7px 6px 6px 6px;}

public/stylesheets/educoder/edu-all.css

@@ -3139,6 +3139,12 @@ line-height: 20px;display: inline-block;color: rgba(65, 140, 205, 1) !important;
 #requireTable thead .td-head-child:last-child{border-right: none;}
 
 
+
+/*附件有关*/
+a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
+
+
+
 /*用户列表*/
 .managerPanels a{margin-right:24px;}
 .managerPanels a:nth-child(16n){margin-right: 0px;}