From c41a11637878f255fec3963bbf5c2bd4d42f22aa Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 14 Jul 2016 17:00:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E4=B8=8A=E4=BC=A0=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E5=90=8E=EF=BC=8C=E7=BC=96=E8=BE=91=E5=A4=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA=EF=BC=9B?= =?UTF-8?q?=E5=A4=A7=E7=BA=B2=E5=BC=95=E7=94=A8css=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_syllabus.html.erb | 2 +- app/views/layouts/new_base_user.html.erb | 2 +- public/stylesheets/css/common.css | 2 +- public/stylesheets/css/courses.css | 2 +- public/stylesheets/css/popup.css | 4 +++- public/stylesheets/css/structure.css | 1 - 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/base_syllabus.html.erb b/app/views/layouts/base_syllabus.html.erb index 5aa23b3c5..7713c41e6 100644 --- a/app/views/layouts/base_syllabus.html.erb +++ b/app/views/layouts/base_syllabus.html.erb @@ -7,7 +7,7 @@ <%= csrf_meta_tag %> <%= favicon %> - <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'syllabus','new_user','prettify','share',:media => 'all' %> + <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'syllabus','css/common','css/public','css/structure','css/courses','prettify',:media => 'all' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= javascript_heads %> <%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify','syllabus'%> diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index d78d06462..f280f6506 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -7,7 +7,7 @@ <%= csrf_meta_tag %> <%= favicon %> - <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'css/popup','prettify','css/project','css/courses','syllabus',:media => 'all' %> + <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','syllabus',:media => 'all' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= javascript_heads %> <%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%> diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index 614d8679f..06370489f 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -304,7 +304,7 @@ a.linkGrey6:hover {color:#ffffff !important;} .W320{ width:320px;} .W420 {width:420px;} .W440{ width:440px;} -.W600{ width:600px;} +.W600{ width:600px !important;} .W700{ width:700px; max-width:700px; min-width:700px;} .W710{ width:708px;} .maxwidth150{max-width: 150px;} diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css index 69d69dff0..02f375a76 100644 --- a/public/stylesheets/css/courses.css +++ b/public/stylesheets/css/courses.css @@ -402,7 +402,7 @@ a.work_list_tit{width:580px; display:block; overflow:hidden; font-size:14px; f .td_board_left{border-right: 1px solid #e4e4e4;} .c_w{ color:#fff;} -.filename { background: url(/images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} +.filename { background: url(/images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;border: none; padding-left: 20px; white-space: nowrap; text-overflow:ellipsis;} .evaluation{position: relative;} .evaluation_submit{position: absolute;right: 0px;bottom: 0px;} .student_work_search{background-color: #64bdd9;color: white !important;padding: 2px 7px;margin-left: 10px;cursor: pointer; } diff --git a/public/stylesheets/css/popup.css b/public/stylesheets/css/popup.css index f00086f46..4b3d513cf 100644 --- a/public/stylesheets/css/popup.css +++ b/public/stylesheets/css/popup.css @@ -201,6 +201,7 @@ a:hover.ping_sub{ background:#14a8b9;} /*.ping_distop span{ float:left;}*/ .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;} .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;} +.ping_disfoot span a span{ color: #6883b6;} /*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/ span.author { font-size: 0.9em; color: #888; } @@ -246,7 +247,8 @@ a:hover.link_file{ background:url(/images/pic_file.png) 0 -25px no-repeat; color #attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';} #attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; } #attachments_fields span.ispublic-label {display: inline-block;width: 30px;margin-left: 10px;} -#attachments_fields input.filename {border: 0;height: 1.8em;color: #555;background: url(/images/attachment.png) no-repeat 1px ;padding-left: 18px;padding-top: 2px; white-space: nowrap; } +#attachments_fields input.filename {border:0; height:1.8em; width:200px; color:#7f7f7f; background: url(/images/pic_file.png) 0 3px no-repeat; padding-left:18px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;} +/*#attachments_fields input.filename {border: 0;height: 1.8em;color: #555;background: url(/images/attachment.png) no-repeat 1px ;padding-left: 18px;padding-top: 2px; white-space: nowrap; }*/ #attachments_fields span {display: block;white-space: nowrap;} #attachments_fields .ajax-waiting input.filename {background:url(/images/hourglass.png) no-repeat 0px 50%;} #attachments_fields .ajax-loading input.filename {background:url(/images/loading.gif) no-repeat 0px 50%;} diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css index a0daadded..ef9b3bc3e 100644 --- a/public/stylesheets/css/structure.css +++ b/public/stylesheets/css/structure.css @@ -115,7 +115,6 @@ div#menu ul ul ul li a{ width:185px; overflow:hidden; white-space: nowrap; text- /*缺陷更新动态在消息中显示样式*/ .issue_update_message{padding-left: 2px; margin-right: 3px;} .issue_update_message_value{margin-right: 8px;} -#attachments_fields input.filename {border: 0; height: 1.8em; width: 200px; color: #7f7f7f; background-color: inherit; background: url(/images/pic_file.png) 0 3px no-repeat; padding-left: 18px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; margin-bottom: 3px;} .ajax-waiting input.upload_filename {background:url(/images/hourglass.png) no-repeat 0px 50%;} .ajax-loading input.upload_filename {background:url(/images/loading.gif) no-repeat 0px 50%;} div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }