From 26c112cbed74d21c8bc2fcf30e0c66cbf7443455 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 19 Apr 2019 17:23:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E5=85=B3=E8=AF=BE=E7=A8=8Bcss?= =?UTF-8?q?=E5=A4=8D=E7=94=A8=E6=88=96=E5=86=97=E4=BD=99=E6=83=85=E5=86=B5?= =?UTF-8?q?=E7=9A=84=E5=88=A0=E5=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/settings/_choose_course_group.html.erb | 2 +- app/views/layouts/base_courses.html.erb | 6 +++++- app/views/layouts/base_edu.html.erb | 3 ++- public/stylesheets/css/courses.css | 1 - public/stylesheets/educoder/edu-all.css | 6 ++++++ 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/views/courses/settings/_choose_course_group.html.erb b/app/views/courses/settings/_choose_course_group.html.erb index 71f60f90..b6b434e5 100644 --- a/app/views/courses/settings/_choose_course_group.html.erb +++ b/app/views/courses/settings/_choose_course_group.html.erb @@ -12,7 +12,7 @@ 请先选择一个分班 <% end %> -
+
确定 取消
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 393a7139..b92f5ad1 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/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' %> + + <%= 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 -%> diff --git a/app/views/layouts/base_edu.html.erb b/app/views/layouts/base_edu.html.erb index 2638a1df..299b8aad 100644 --- a/app/views/layouts/base_edu.html.erb +++ b/app/views/layouts/base_edu.html.erb @@ -9,8 +9,9 @@ <%= favicon %> <%= heads_for_theme %> <%= call_hook :view_layouts_base_html_head %> + <%= 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 %> diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css index 62d7ad4f..a4a70a08 100644 --- a/public/stylesheets/css/courses.css +++ b/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;} diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 13775084..49cccd8f 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/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;}