From 65cbf14d72c4e4abc64ea3a66a9731f3581d8d7e Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 7 Jul 2016 17:06:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=8E=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=97=B4=E6=B7=BB=E5=8A=A0=E9=97=B4=E8=B7=9D?= =?UTF-8?q?=EF=BC=9B=E5=9B=BE=E6=A0=87=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../files/_upload_org_new_files.html.erb | 2 +- .../_upload_org_new_files_banner.html.erb | 2 +- app/views/files/_upload_project_files.erb | 2 +- app/views/files/_upload_show.html.erb | 2 +- app/views/files/_upload_show_project.html.erb | 2 +- .../files/_upload_subfield_file.html.erb | 2 +- .../_upload_project_files_on_navbar.html.erb | 2 +- public/stylesheets/css/common.css | 26 ++++++++++--------- public/stylesheets/css/courses.css | 22 ++++------------ public/stylesheets/css/org.css | 6 ----- public/stylesheets/css/popup.css | 14 ++-------- public/stylesheets/css/project.css | 7 +---- public/stylesheets/css/public.css | 25 ++++++++---------- public/stylesheets/css/structure.css | 10 +++---- public/stylesheets/polls.css | 3 --- public/stylesheets/users.css | 2 -- 16 files changed, 45 insertions(+), 84 deletions(-) diff --git a/app/views/files/_upload_org_new_files.html.erb b/app/views/files/_upload_org_new_files.html.erb index cd460e328..5126c1053 100644 --- a/app/views/files/_upload_org_new_files.html.erb +++ b/app/views/files/_upload_org_new_files.html.erb @@ -8,7 +8,7 @@ <%= render :partial => 'files/org_upload_attachment_list', :locals => {:container => org}%>
- <%= l(:button_cancel)%> + <%= l(:button_cancel)%> <%= l(:button_confirm)%> <% end %> diff --git a/app/views/files/_upload_org_new_files_banner.html.erb b/app/views/files/_upload_org_new_files_banner.html.erb index 0cb767bf2..a427e0c72 100644 --- a/app/views/files/_upload_org_new_files_banner.html.erb +++ b/app/views/files/_upload_org_new_files_banner.html.erb @@ -8,7 +8,7 @@ <%= render :partial => 'files/org_upload_attachment_list_banner', :locals => {:container => org}%>
- <%= l(:button_cancel)%> + <%= l(:button_cancel)%> <%= l(:button_confirm)%> <% end %> diff --git a/app/views/files/_upload_project_files.erb b/app/views/files/_upload_project_files.erb index 478297af5..9b32b2a9d 100644 --- a/app/views/files/_upload_project_files.erb +++ b/app/views/files/_upload_project_files.erb @@ -30,7 +30,7 @@
- <%= l(:button_cancel)%> + <%= l(:button_cancel)%> <%= submit_tag '确定',:onclick=>'submit_resource();', :onfocus=>'this.blur()', :id=>'submit_resource', :class=>'sendSourceText fr' %> <% end %> diff --git a/app/views/files/_upload_show.html.erb b/app/views/files/_upload_show.html.erb index dbd0277d7..2e222ea6b 100644 --- a/app/views/files/_upload_show.html.erb +++ b/app/views/files/_upload_show.html.erb @@ -10,7 +10,7 @@ <%= render :partial => 'attachement_list',:locals => {:course => course} %>
- <%= l(:button_cancel)%> + <%= l(:button_cancel)%> <%= submit_tag '确定',:onclick=>'submit_resource();',:onfocus=>'this.blur()',:id=>'submit_resource',:class=>'sendSourceText fr' %> <% end %> diff --git a/app/views/files/_upload_show_project.html.erb b/app/views/files/_upload_show_project.html.erb index 204243e76..e2a66abcc 100644 --- a/app/views/files/_upload_show_project.html.erb +++ b/app/views/files/_upload_show_project.html.erb @@ -10,7 +10,7 @@ <%= render :partial => 'attachement_list',:locals => {:project => project} %>
- <%= l(:button_cancel)%> + <%= l(:button_cancel)%> <%= submit_tag '确定',:onclick=>'submit_resource();',:onfocus=>'this.blur()',:id=>'submit_resource',:class=>'sendSourceText fr' %> <% end %> diff --git a/app/views/files/_upload_subfield_file.html.erb b/app/views/files/_upload_subfield_file.html.erb index 8dcfe2dd5..a45073df1 100644 --- a/app/views/files/_upload_subfield_file.html.erb +++ b/app/views/files/_upload_subfield_file.html.erb @@ -23,7 +23,7 @@
- <%= l(:button_cancel)%> + <%= l(:button_cancel)%> <%= l(:button_confirm)%> <% end %> diff --git a/app/views/projects/_upload_project_files_on_navbar.html.erb b/app/views/projects/_upload_project_files_on_navbar.html.erb index 591e159f1..c9d7a7fa5 100644 --- a/app/views/projects/_upload_project_files_on_navbar.html.erb +++ b/app/views/projects/_upload_project_files_on_navbar.html.erb @@ -11,7 +11,7 @@ <%= render :partial => 'projects/upload_project_files_list',:locals => {:container => container} %>
- <%= l(:button_cancel)%> + <%= l(:button_cancel)%> <%= l(:button_confirm)%> <% end %> diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index 9b3e7bc1c..614d8679f 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -219,6 +219,7 @@ a.linkGrey6:hover {color:#ffffff !important;} .w45{ width: 45px;} .w48{width:48px;} .w50 {width:50px;} +.w56 {width:56px;} .w60{ width:60px;} .w70{ width:70px;} .w80{ width:80px;} @@ -374,6 +375,7 @@ a:hover.c_grey{ color:#333;} .c_red{ color:#F00;} .c_green{ color:#28be6c;} .c_grey{color:#999;} +.c_grey02{ color:#666666;} .c_dgrey{ color:#696969;} .c_dblue{ color:#09658c;} .c_white {color:#fff;} @@ -385,6 +387,7 @@ a:hover.c_grey{ color:#333;} .b_slow_red{background:#df8538;} .b_green2 {background:#63c360;} .b_red {background:#d60308;} +.b_lblue{ background:#269ac9;} /*font&color add by Tim*/ .fontGrey {color:#cecece;} @@ -514,7 +517,6 @@ a:hover.bgreen_n_btn{background:#08a384;} .nolink_btn{ background:#BCBCBC; color: #fff; padding:2px 5px;} .more_btn{-moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF; border-radius:3px; padding:0px 3px;} -.upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;} .upbtn{ margin:40px 0 0 15px; display:block; padding:2px 5px; border:1px solid #eaeaea;} .upbtn:hover{color:#64bdd9;cursor: pointer;} .upload_file{margin-left: -60px;margin-top: 40px;width: 50px;position: absolute;height: 24px;opacity: 0;cursor: pointer} @@ -541,21 +543,21 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;} a.Blue-btn{ display:block; margin-right:15px;width:65px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #3598db; color:#3598db; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} a:hover.Blue-btn{ background:#3598db; color:#fff;} /* commonpic */ -.pic_date{ display:block; background:url(../images/public_icon.png) -31px 0 no-repeat; width:16px; height:15px; } -.pic_add{ display:block; background:url(../images/public_icon.png) -31px -273px no-repeat; width:16px; height:15px; } -.pic_sch{ display:block; background:url(../images/public_icon.png) -31px -195px no-repeat; width:16px; height:15px; } -.pic_mes{ display:block; background:url(../images/public_icon.png) 0px -376px no-repeat; width:20px; height:15px; padding-left:18px;} -.pic_img{ display:block; background:url(../images/public_icon.png) -31px -419px no-repeat; width:20px; height:15px; } +.pic_date{ display:block; background:url(/images/public_icon.png) -31px 0 no-repeat; width:16px; height:15px; } +.pic_add{ display:block; background:url(/images/public_icon.png) -31px -273px no-repeat; width:16px; height:15px; } +.pic_sch{ display:block; background:url(/images/public_icon.png) -31px -195px no-repeat; width:16px; height:15px; } +.pic_mes{ display:block; background:url(/images/public_icon.png) 0px -376px no-repeat; width:20px; height:15px; padding-left:18px;} +.pic_img{ display:block; background:url(/images/public_icon.png) -31px -419px no-repeat; width:20px; height:15px; } .pic_del{ display:block; background:url(/images/public_icon.png) 0px -235px no-repeat; width:20px; height:15px; } .pic_del:hover{ background:url(/images/public_icon.png) -32px -235px no-repeat; } -.pic_stats{display:block; background:url(../images/public_icon.png) 0px -548px no-repeat; width:20px; height:15px;} -.pic_files{display:block; background:url(../images/public_icon.png) 0px -578px no-repeat; width:20px; height:15px;} -.pic_text{display:block; background:url(../images/public_icon.png) 0px -609px no-repeat; width:20px; height:18px;} -.pic_text02{display:block; background:url(../images/public_icon.png) 0px -642px no-repeat; width:20px; height:19px;} +.pic_stats{display:block; background:url(/images/public_icon.png) 0px -548px no-repeat; width:20px; height:15px;} +.pic_files{display:block; background:url(/images/public_icon.png) 0px -578px no-repeat; width:20px; height:15px;} +.pic_text{display:block; background:url(/images/public_icon.png) 0px -609px no-repeat; width:20px; height:18px;} +.pic_text02{display:block; background:url(/images/public_icon.png) 0px -642px no-repeat; width:20px; height:19px;} .pic_edit{display:block; background:url(/images/public_icon.png) 0px -32px no-repeat; width:20px; height:15px;} .pic_edit:hover{display:block; background:url(/images/public_icon.png) -32px -32px no-repeat; width:20px; height:15px;} -.pic_edit2{display:inline-block; background:url(../images/public_icon.png) 0px -32px no-repeat; width:20px; height:15px; vertical-align:middle; display:none;} -.pic_edit2:hover{display:inline-block; background:url(../images/public_icon.png) -32px -32px no-repeat; width:20px; height:15px;} +.pic_edit2{display:inline-block; background:url(/images/public_icon.png) 0px -32px no-repeat; width:20px; height:15px; vertical-align:middle; display:none;} +.pic_edit2:hover{display:inline-block; background:url(/images/public_icon.png) -32px -32px no-repeat; width:20px; height:15px;} /*文本左对齐*/ .tl{text-align: left;} diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css index b6fadfb0c..f91109247 100644 --- a/public/stylesheets/css/courses.css +++ b/public/stylesheets/css/courses.css @@ -23,11 +23,6 @@ a.DropBtn{background: url(../images/homepage_icon.png) -125px -339px no-repeat; a:hover.DropBtn{background: url(../images/homepage_icon.png) -125px -370px no-repeat;} .DropLine{border-top:1px solid #d9d9d9; float:left; width:623px; height:10px; margin-top:10px;} -/*20150820编程作业 LB*/ -.icon_add{ background:url(../images/course/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;} -a:hover.icon_add{background:url(../images/course/icons.png) -20px -310px no-repeat;} -.icon_remove{background:url(../images/course/icons.png) 0px -338px no-repeat; width:16px; height:27px; display:block;float:left;} -a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-repeat;} /*20150820提交作业 LB*/ .HomeWorkBox{ background:#f6f6f6; padding:10px;} .c_grey{ color:#888888;} @@ -135,8 +130,6 @@ a:hover.tijiao{ background:#297fb8;} .ni_con_work { width:300px; margin:25px 20px;} .ni_con_work p{ color:#808181; } .grey_c{ color:#808181;} -a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; } -a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;} .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} .ul_grey li {color:#909090; list-style-position:inside; padding-left:1px;list-style-image:url('../images/news_dot2.png')} @@ -319,10 +312,10 @@ div#menu_r ul ul li {width: 100%;} .hwork_new_grey{background:#dbdbdb; width:610px; padding:10px 20px; margin:0 auto; text-align:left; margin-bottom:5px;} .hwork_new_left{ width:220px; float:left; } .hwork_new_right{ width:350px; float:left; margin-left:40px;} -.icon_add{background:url(images/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;} -a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;} -.icon_remove{background:url(images/icons.png) 0px -338px no-repeat; width:16px; height:27px; display:block;float:left;} -a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;} +.icon_add{background:url(../images/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;} +a:hover.icon_add{background:url(../images/icons.png) -20px -310px no-repeat;} +.icon_remove{background:url(../images/icons.png) 0px -338px no-repeat; width:16px; height:27px; display:block;float:left;} +a:hover.icon_remove{background:url(../images/icons.png) -20px -338px no-repeat;} /* 20150512作品展示*/ .hwork_ul{ height:24px; padding-top:10px;} @@ -394,11 +387,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;} -.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; } -.upload_filename{ background: url(/images/pic_file.png) 0 -20px no-repeat;color: #7f7f7f;width: 270px;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;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; 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; } @@ -448,7 +437,6 @@ a.pro_mes_w{ height:20px; display:block; color:#999999;} .pai_box{background:#fff; padding:10px 0 10px 10px;width:230px; color:#3e4040; } .rside_work_con{ width:650px;} -.link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} .last_time{width:auto; text-align:right; margin-right:70px;} .link_file_box{ width:360px;} diff --git a/public/stylesheets/css/org.css b/public/stylesheets/css/org.css index 5614c423f..a86c4ff6e 100644 --- a/public/stylesheets/css/org.css +++ b/public/stylesheets/css/org.css @@ -29,10 +29,6 @@ a.saveBtn:hover {background-color:#297fb8;} .orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;} .undis {display:none;} .dis {display:inline-block;} -.upbtn { margin: 40px 0px 0px 15px; - display: block; - padding: 2px 5px; - border: 1px solid #EAEAEA;} a.org_member_btn{ padding:1px 5px; background:#15bccf; color:#fff;} @@ -91,8 +87,6 @@ a.linkGrey8:hover {color:#585858;} .re_search{ margin-top:7px; margin-left:5px;} .re_schbox{ width:240px; height:24px; border:1px solid #64bdd9; color:#666666;} .re_schbtn{ width:60px; height:26px; color:#fff; margin-right:5px; border:none; margin-left:0px;padding-left: 0px;} -.b_lblue{ background:#64bdd9;} -.c_grey{ color:#888888;} .re_con{ margin:5px; width:665px;} .re_con_top{color:#494949; } .re_con_top span{ color:#999999; font-weight:bold;} diff --git a/public/stylesheets/css/popup.css b/public/stylesheets/css/popup.css index a162833ee..9e03d1134 100644 --- a/public/stylesheets/css/popup.css +++ b/public/stylesheets/css/popup.css @@ -114,8 +114,6 @@ a.choose-active {background-color:#269ac9; color:#ffffff;} .subject-pop-count {width:60px; text-align:center;} .subject-pop-from {width:140px; text-align:center;} .subjectContent p,.subjectContent div,.subjectContent em, .subjectContent span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important; color:#888888 !important; font-size:12px !important;} -.whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;} -.whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;} /*导入资源样式*/ .popupWrap {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;} @@ -135,8 +133,6 @@ a.choose-active {background-color:#269ac9; color:#ffffff;} .resource-pop-type {width:70px; text-align:center;} .resource-pop-size {width:65px; text-align:center;} .resource-pop-from {width:120px; text-align:center;} -.whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;} -.whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;} .course-search {border: 1px solid #dddddd; height: 25px; width: 200px;outline: none;} @@ -147,8 +143,8 @@ a.C_Blue{ color:#3598db;} a:hover.C_Blue{ color:#297fb8;} .BluePopupBox{ padding:20px; background:#fff; width:707px;} /*.BluePopupBox:hover{ border:3px solid #297fb8; }*/ -a.CloseBtn{background:url(../images/CloseBtn.png) 0px 0px no-repeat; width:13px; height:13px; display:block; float:right;} -a:hover.CloseBtn{background:url(../images/CloseBtn.png) 0px -24px no-repeat; } +a.CloseBtn{background:url(/images/CloseBtn.png) 0px 0px no-repeat; width:13px; height:13px; display:block; float:right;} +a:hover.CloseBtn{background:url(/images/CloseBtn.png) 0px -24px no-repeat; } .BluePopuph2{ font-size:16px; font-weight:bold; color:#3598db; } .ProBoxResult{width:706px; background-color:#fff; border:1px solid #dddddd;border-bottom:none; max-height:300px; overflow:auto; } .HomeWorkCon{ width:706px;} @@ -211,7 +207,6 @@ span.author { font-size: 0.9em; color: #888; } /* 匿名评分弹框 */ /*.popbox02{width:480px;height:200px;position:absolute;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;}*/ .alert .close02{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-490px;background:url(images/close.png) no-repeat;cursor:pointer;} -a.xls{ margin-left:5px; color:#136b3b;} /* 开启匿评弹框 */ .anonymos{width:480px;height:180px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} @@ -226,7 +221,6 @@ a:hover.tijiao{ background:#0f99a9;} .c_pink{ color:#e65d5e;} .ni_con_work { width:300px; margin:25px 20px;} .ni_con_work p{ color:#808181; } -a.xls{ margin-left:5px; color:#136b3b;} .grey_c{ color:#808181;} .disable_btn { height:46px; display:block; width:90px; color:#fff; background:#d0d2d0; text-align:center; padding-top:4px; margin-right:15px;} a.term_btn{ height:38px; display:block; width:90px; color:#fff; background:#269ac9; text-align:center; padding-top:12px; margin-right:15px;} @@ -260,9 +254,6 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;} #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .reply_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #ccc; color:#999; border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;} .reply_btn:hover{ background:#999; color:#fff; } -.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%;} -.upload_filename{ background: url(/images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 270px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} #attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; } @@ -326,7 +317,6 @@ a.contributor_course{float: right; color: #888; font-size: 12px; font-weight: no .active-degree-rule{font-size: 12px;color: #888; text-align: center; cursor: pointer;} .hero-degree-rule{font-size: 12px;color: #888;text-align: center;} .contributor-course-calculate{padding-left: 54px; font-size: 12px;color: #888} -a.blue-btn {padding: 4px 7px; color: #FFF; border: none; background-color: #269ac9; cursor: pointer; text-align: center;} /*转发样式*/ .shareDP {width:415px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:relative; z-index:1000;} diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index eb78aca7d..e5b7f1abe 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -285,8 +285,6 @@ legend {color: #484848;} .pro_st_dis{display:block; } .pro_st_undis{display:none;} -.upbtn { margin: 40px 0px 0px 15px;display: block;padding: 2px 5px;border: 1px solid #EAEAEA;} - .upimg{ border:1px solid #eaeaea; display:block; width:60px; height:60px; padding:1px;} .upimg:hover{ border:1px solid #64bdd9; } .box{ margin-bottom:10px;} @@ -447,10 +445,7 @@ p.other-formats { text-align: right; font-size:0.9em; color: #666; } /****资源库***/ .resource a{ text-align:center;} -.b_lblue{ background:#64bdd9;} -.b_dblue{ background:#55a1b9; cursor:pointer;} -a.c_grey{ color:#999999;} -.c_grey02{ color:#666666;} +.b_dblue{ background:#298fbd; cursor:pointer;} .c_dblue{ color:#3e6d8e;} .resource{ width:670px;} .re_top{width:660px; height:40px; background:#eaeaea; padding:5px;} diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css index 87ccd0139..662d6d4eb 100644 --- a/public/stylesheets/css/public.css +++ b/public/stylesheets/css/public.css @@ -632,7 +632,6 @@ a:hover.st_img { border:1px solid #1c9ec7; } /* 20150506上传头像*/ .uppicBox{ width:265px; height:265px; background:#f2f2f5; float:left; color:#666; text-align:center;} .showpicBox{width:133px; height:250px; background:#f2f2f5; float:left; margin-left:20px; text-align:center; padding-top:15px; color:#666;} -.uppic_btn{border:none; width:150px; background:none; margin-bottom:5px; color:#666; margin-top:105px;} /* TAB 切换效果 */ .users_tb_{ border-bottom:3px solid #CCC; height:26px; } @@ -704,10 +703,6 @@ a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;} .top_new_bg{ background:url(../images/pic_uersall.png) -43px 3px no-repeat; height:26px; width:260px;} .top_newcourses_bg{ background:url(../images/pic_uersall.png) -43px -29px no-repeat; height:28px; width:260px;} .top_newproject_bg{ background:url(../images/pic_uersall.png) -43px -56px no-repeat; height:26px; width:260px;} -.newbtn{ height:24px; background:#18ca74; color:#fff; font-size:14px; padding:2px 12px 0 12px;} -.newbtn:hover{background: #14ad5a;} -a.newbtn_add{ display:block; background:url(../images/pic_uersall.png) -265px 3px no-repeat; height:20px; width:15px;} -a.newbtn_t{ font-size:14px; font-weight:bold; color:#fff;} /* 左侧信息*/ .users_info{background:#fff; padding:10px; width:230px; padding-right:0px; margin-bottom:10px; } @@ -726,6 +721,7 @@ a.newbtn_t{ font-size:14px; font-weight:bold; color:#fff;} .st_search{ } .st_search span{ font-size:14px; font-weight:bold; color:#606060; margin-right:35px;} .st_search_input{ border:1px solid #1c9ec7; background:#fff; height:20px; color:#c4c4c4; width:220px; padding-left:5px; margin-bottom:5px;} +a.xls{ margin-left:5px; color:#136b3b;} .st_search a{ background:#1c9ec7; color:#fff;border:1px solid #1c9ec7; text-align:center; display:block; width:60px; height:20px; float:left; font-size:12px; } .st_search a:hover{ background:#048fbb; text-decoration:none;} .classbox{ border:1px solid #f8df8c; background:#fffce6; color:#0d90c3; padding:0 3px; float:left; margin-left:15px;} @@ -746,6 +742,7 @@ a.newbtn_t{ font-size:14px; font-weight:bold; color:#fff;} a:hover.st_add{ color:#ff8e15;} .classbox_on{ border:1px solid #f8df8c; background:#f6f098; padding:0 3px; float:left; margin-left:15px;} .classbox_on a{ color:#716cad;} +.st_list_score {width:105px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; vertical-align:middle; font-size:12px; text-align:center;} /* 创建作品 homework,项目配置 */ .hwork_new{ color:#4c4c4c;} @@ -946,17 +943,17 @@ a:hover.member_btn{ background:#329cbd;} .pr_info_logo{ border:1px solid #eaeaea; width:60px; height:60px; padding:1px;} .pr_info_logo:hover{ border:1px solid #64bdd9; } .pr_info_join{} -a.pr_join_a{ color:#fff; display:block; padding:0 5px 0 3px; padding-top:2px; height:20px; margin-right:5px; float:left; text-align:center; background-color:#64bdd9; float:left; } -a.pr_join_a_quit{ color:#fff; display:block; padding:0 2px 0 3px; padding-top:2px; height:20px; margin-right:5px; float:left; text-align:center; background-color:#64bdd9; float:left; } -a:hover.pr_join_a{ background:#41a8c8;} +a.pr_join_a{ color:#fff; display:block; padding:0 5px 0 3px; padding-top:2px; height:20px; margin-right:5px; float:left; text-align:center; background-color:#269ac9; float:left; } +a.pr_join_a_quit{ color:#fff; display:block; padding:0 2px 0 3px; padding-top:2px; height:20px; margin-right:5px; float:left; text-align:center; background-color:#269ac9; float:left; } +a:hover.pr_join_a{ background:#298fbd;} .pr_join_span{color: #fff; display:block; padding:0 5px; padding-top:2px; height:20px; margin-right:5px; float:left; text-align:center; background: #CCC;} .pr_setting{ display:block; background:url(/images/leftside.png) -1px 0 no-repeat; width:11px; height:11px; margin-top:3px; float:left; } -.pr_copy{ display:block; background:url(../images/leftside.png) -1px -23px no-repeat; width:11px; height:11px; margin-top:3px; float:left; } -.pr_close{ display:block; background:url(../images/leftside.png) -1px -49px no-repeat; width:11px; height:11px; margin-top:3px; float:left; } -.pr_add{display:block; background:url(../images/leftside.png) 0px -71px no-repeat; width:11px; height:11px; margin-top:3px; float:left; } -.pr_arrow{display:block; background:url(../images/leftside.png) 0px -90px no-repeat; width:11px; height:11px; margin-top:3px; float:left; } -.pr_friend{display:block; background:url(../images/leftside.png) 0px -112px no-repeat; width:12px; height:11px; margin-top:4px; float:left; } -.pr_keyan{display:block; background:url(../images/leftside.png) 0px -135px no-repeat; width:12px; height:11px; margin-top:4px; float:left; } +.pr_copy{ display:block; background:url(/images/leftside.png) -1px -23px no-repeat; width:11px; height:11px; margin-top:3px; float:left; } +.pr_close{ display:block; background:url(/images/leftside.png) -1px -49px no-repeat; width:11px; height:11px; margin-top:3px; float:left; } +.pr_add{display:block; background:url(/images/leftside.png) 0px -71px no-repeat; width:11px; height:11px; margin-top:3px; float:left; } +.pr_arrow{display:block; background:url(/images/leftside.png) 0px -90px no-repeat; width:11px; height:11px; margin-top:3px; float:left; } +.pr_friend{display:block; background:url(/images/leftside.png) 0px -112px no-repeat; width:12px; height:11px; margin-top:4px; float:left; } +.pr_keyan{display:block; background:url(/images/leftside.png) 0px -135px no-repeat; width:12px; height:11px; margin-top:4px; float:left; } .pr_kafa{display:block; background:url(/images/leftside.png) 0px -156px no-repeat; width:12px; height:11px; margin-top:4px; float:left; } .pr_info_name{ color:#3e4040; font-size:14px; line-height:1.5;} .pr_info_name:hover{ color:#3ca5c6;} diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css index f4b92c6d8..53cb29f13 100644 --- a/public/stylesheets/css/structure.css +++ b/public/stylesheets/css/structure.css @@ -128,10 +128,10 @@ div#menu ul ul ul li a{ width:185px; overflow:hidden; white-space: nowrap; text- 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%;} +.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; } -.upload_filename{ background: url(/images/pic_file.png) 0 -25px no-repeat;color: #7f7f7f;width: 270px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} +.upload_filename{ background: url(/images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 270px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .message_title{border: 1px solid #9C9C9C;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff; max-width:400px;word-wrap:break-word; word-break:break-all;} .message_title_red{border: 1px solid #484848;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff;background-image: -moz-linear-gradient(top, #fff, #E0E0E0);} @@ -249,8 +249,8 @@ a.postReplyCancel:hover {color:#ffffff;} .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;} .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;z-index:999;} .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat; cursor: pointer;} -.whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;} -.whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;} +.whiteSettingIcon {background:url(/images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;} +.whiteSettingIcon:hover {background:url(/images/homepage_icon.png) -93px -44px no-repeat;} a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;text-align:center;} a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} a.postOptionLink2 {color:#616060; display:block; width:35px; padding:0px 15px;} diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css index 1cb288d51..c1f29628a 100644 --- a/public/stylesheets/polls.css +++ b/public/stylesheets/polls.css @@ -133,7 +133,6 @@ a:hover.btn_pu{ background:#3cb761;} .polls_title_w { max-width:280px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;} .polls_title_st { max-width:530px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;} .polls_de_grey{ color:#b1b1b1; margin-top:3px;} -.ml5{ margin-left:5px;} .polls_btn a{ float:left;} .polls_n{ float:left; background:#ff5d31; color:#fff; width:32px; padding-left:2px; height:7px; padding-bottom:7px; } .polls_n p{ margin-top:-4px;} @@ -152,6 +151,4 @@ a:hover.btn_pu{ background:#3cb761;} .polls_alert_upload_box{ width:120px; margin:15px auto;} .polls_alert_box_p{ font-size:14px; padding-left: 45px;padding-top: 10px;} -.w56 { width: 56px;} - diff --git a/public/stylesheets/users.css b/public/stylesheets/users.css index ad6fefad9..b3c86c596 100644 --- a/public/stylesheets/users.css +++ b/public/stylesheets/users.css @@ -20,8 +20,6 @@ .top_newproject_bg{ background:url(../images/pic_uersall.png) -43px -56px no-repeat; height:26px; width:260px;} .newbtn{ height:24px; background:#18ca74; color:#fff; font-size:14px; padding:2px 12px 0 12px;} .newbtn:hover{background: #14ad5a;} -a.newbtn_add{ display:block; background:url(../images/pic_uersall.png) -265px 3px no-repeat; height:20px; width:15px;} -a.newbtn_t{ font-size:14px; font-weight:bold; color:#fff;} /*留言*/ a.icon_face{background:url(../images/public_icon.png) 0px -671px no-repeat; display:block; height:25px; width:40px; padding-left:25px; padding-top:3px; } a:hover.icon_face{background:url(../images/public_icon.png) -79px -671px no-repeat; }