From c693afdee86fd5b2dfdb7e12c0b1f8a5789421cd Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 11 Oct 2016 17:26:36 +0800 Subject: [PATCH] =?UTF-8?q?project.css=E5=8E=BB=E9=87=8D=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E5=8F=96=E5=88=B0public.css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../syllabuses/_syllabus_course_list.html.erb | 2 +- public/stylesheets/css/project.css | 133 ------------------ public/stylesheets/css/public.css | 52 +++++++ public/stylesheets/css/structure.css | 2 +- public/stylesheets/syllabus.css | 35 ----- 5 files changed, 54 insertions(+), 170 deletions(-) diff --git a/app/views/syllabuses/_syllabus_course_list.html.erb b/app/views/syllabuses/_syllabus_course_list.html.erb index a8f22d0cb..6adcae4a7 100644 --- a/app/views/syllabuses/_syllabus_course_list.html.erb +++ b/app/views/syllabuses/_syllabus_course_list.html.erb @@ -62,7 +62,7 @@ <% if User.current.member_of_course?(course) %> <%=link_to '进入班级', course_path(course), :class => 'btn_orange_big fr mt5', :target => '_blank' %> <% else %> - <%= link_to "加入班级",join_private_courses_courses_path,:remote => true,:class => "hw_btn_green2 fr mt5",:method => "post"%> + <%= link_to "加入班级",join_private_courses_courses_path,:remote => true,:class => "hw_btn_green fr mt5",:method => "post"%> <% end %>
diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index fe10650ce..a49750dea 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -560,130 +560,6 @@ a:hover.upload_btn_grey{background:#8a8a8a;} .publish-icon {background:url("/images/new_project/icons_issue.png") 0px -82px no-repeat; width:18px; height:18px; display:block;} .publish-icon:hover {background:url("/images/new_project/icons_issue.png") -25px -82px no-repeat;} -/* 班级主页 */ -.sy_class_infobox{ - padding:15px; - background:#fff; - margin:0px auto ; - width:968px; - border:1px solid #e5e5e5; - position: relative; -} -.homepagePostSetting { - position:absolute; - width:20px; - height:20px; - right:10px; - top:10px; -} -.homepagePostSetting ul li:hover ul { - display:block; -} - -.homepagePostSettiongText { - width:75px; - text-align: center; - line-height:2; - font-size:12px; - color:#616060; - background-color:#ffffff; - border:1px solid #eaeaea; - border-radius:3px; - position:absolute; - left:-60px; - top:20px; - padding:5px 0px; - display:none; - box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); -} - -a.postOptionLink { - color:#616060; - display:block; - width:55px; - padding:0px 10px; -} -a.postOptionLink:hover { - color:#fff; - background-color:#3b94d6; -} - -.sy_class_logo{ - width:110px; - height:110px; -} -.sy_class_id{ - width:110px; - height:80px; - background:#fff; - border: 1px solid #f1f1f1; - text-align:center; - padding-top:30px; -} -.sy_class_id p{ - font-size:16px; - color:#333; -} -.sy_class_title{ - font-size: 18px; - font-weight: normal; - margin-bottom: 5px; - max-width:440px; - overflow:hidden; - white-space: nowrap; - text-overflow:ellipsis; -} - -.sy_class_titbox{margin-bottom:5px; padding-top:10px; } - -/*旧版课程大纲新建编辑*/ -.sy_tab_con{width:740px; padding:20px; position:relative;} -.syllabuscon_title{ - color:#000; text-align:center; -} -.syllabuscon_txt p{ - font-size:14px; - line-height:1.9; - color:#000; -} -.syllabuscon_txt_title{ - font-weight:bold; - margin:10px 0; -} -.syllabusbox_tishi{ - font-size:14px; - width:733px; - color:#cb7c01; - padding:10px 0 0 15px; - margin-bottom:10px; - background:#fff7d1; - border:1px solid #fcd9b4; - height:34px; -} -a.syllabusbox_a_blue{ - color:#3b94d6; -} -.syllabus_leftinfo p{ - line-height:25px; - width:150px; - overflow:hidden; - white-space: nowrap; - text-overflow:ellipsis; -} -.syllabus_info_tishi{ - font-size:16px; - width:400px; - margin:100px auto; -} -.syllabus_info_tishi a{ - color:#3b94d6; -} -.homepagePostSettiongText {width:75px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-48px; top:20px; padding:5px 0px; display:none;} -a.AnnexBtn{ background: url(../images/homepage_icon.png) 0px -343px no-repeat !important; height:20px; display:block; padding-left:20px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;} -a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat !important; color:#3598db; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;} -a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #3b94d6; color:#3b94d6; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} -a:hover.BlueCirBtnMini{ background:#3b94d6; color:#fff;} - /* 缺陷列表 */ .issues_greycirbg_btn{ background-color:#dedede; padding:1px 5px;-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; } .issues_greycirbg_btn:hover{background-color:#cbcbcb;} @@ -731,15 +607,6 @@ a:hover.issues_list_title{color:#3b94d6;} .issues_list_txt li{ height: 50px; float: left; font-size: 12px; width: 70px; text-align: center; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap;} .issues_list_txt li.issues_list_min{ width: 52px;} - -/* 搜索 与课程相同 */ -.hw_search_box{ position:relative; } -.hw_search_box input.hw_search-input{ width:293px; height:28px; border:none; border:1px solid #e7e7e7; background:#fff; padding-left:5px;} -.hw_search_box a.hw_btn_search{display:block; width:20px; height:20px; background:url(/images/hw/icons_hw.png) 0 -57px no-repeat; position:absolute; right:5px; top:5px; cursor:pointer;} -.hw_search_box a:hover.hw_btn_search{background:url(/images/hw/icons_hw.png) -40px -57px no-repeat;} -.hw_files_icon{display:block; width:17px; height:14px; background:url(/images/hw/icons_hw.png) 0 -135px no-repeat;} - - /* 新增粉色关注按钮*/ a.sy_btn_pink{ display: inline-block; diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css index 8aded437c..ffa1bc206 100644 --- a/public/stylesheets/css/public.css +++ b/public/stylesheets/css/public.css @@ -1457,3 +1457,55 @@ a.sy_cblue{ color: #3b94d6;} .sy_icons_del{ padding:9px;background:url(/images/sy/sy_icons02.png) 0 -21px no-repeat;} .sy_icons_edit:hover{ background:url(/images/sy/sy_icons02.png) -20px 1px no-repeat; } .sy_icons_del:hover{ background:url(/images/sy/sy_icons02.png) -20px -21px no-repeat;} + +/*搜索*/ +.hw_search_box{ position:relative; } +.hw_search_box input.hw_search-input{ width:293px; height:28px; border:none; border:1px solid #e7e7e7; background:#fff; padding-left:5px;} +.hw_search_box a.hw_btn_search{display:block; width:20px; height:20px; background:url(/images/hw/icons_hw.png) 0 -57px no-repeat; position:absolute; right:5px; top:5px; cursor:pointer;} +.hw_search_box a:hover.hw_btn_search{background:url(/images/hw/icons_hw.png) -40px -57px no-repeat;} +.hw_files_icon{display:block; width:17px; height:14px; background:url(/images/hw/icons_hw.png) 0 -135px no-repeat;} + +/*课程大纲新建编辑*/ +.sy_tab_con{ + width:720px; padding:20px 28px 0 32px; position:relative; +} +.syllabuscon_title{ + color:#000; text-align:center; +} +.syllabuscon_txt p{ + font-size:14px; + line-height:1.9; + color:#000; +} +.syllabuscon_txt_title{ + font-weight:bold; + margin:10px 0; +} +.syllabusbox_tishi{ + font-size:14px; + width:733px; + color:#cb7c01; + padding:10px 0 0 15px; + margin-bottom:10px; + background:#fff7d1; + border:1px solid #fcd9b4; + height:34px; +} +a.syllabusbox_a_blue{ + color:#3b94d6; +} +.syllabus_leftinfo p{ + line-height:25px; + width:150px; + overflow:hidden; + white-space: nowrap; + text-overflow:ellipsis; +} +.syllabus_info_tishi{ + font-size:16px; + width:400px; + margin:100px auto; +} +.syllabus_info_tishi a{ + color:#3b94d6; +} diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css index 4f7c2a91c..47ac92fb6 100644 --- a/public/stylesheets/css/structure.css +++ b/public/stylesheets/css/structure.css @@ -235,7 +235,7 @@ a.postReplyCancel:hover {color:#ffffff;} .homepagePostSetting {position:absolute; width:20px; height:20px; right:0px; top:0px;} .homepagePostSetting ul li:hover ul {display:block;} .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;} +.homepagePostSettiongText {width:85px; text-align:center; 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; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);} .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;} diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css index 14ca4ceda..c74f977d3 100644 --- a/public/stylesheets/syllabus.css +++ b/public/stylesheets/syllabus.css @@ -40,37 +40,6 @@ input.syllabus_input_min{ background: #fff; border: 1px solid #dddddd; } -.sy_tab_con{ - width:720px; padding:20px 28px 0 32px; position:relative; -} -.syllabuscon_title{ - color:#000; text-align:center; -} -.syllabuscon_txt p{ - font-size:14px; - line-height:1.9; - color:#000; -} -.syllabuscon_txt_title{ - font-weight:bold; - margin:10px 0; -} - -.syllabus_leftinfo p{ - line-height:25px; - width:150px; - overflow:hidden; - white-space: nowrap; - text-overflow:ellipsis; -} -.syllabus_info_tishi{ - font-size:16px; - width:400px; - margin:100px auto; -} -.syllabus_info_tishi a{ - color:#3b94d6; -} /*课程大纲-课程列表*/ .icon_course{ background: url(../images/syllabus/icons_syllabus.png) 0 -35px no-repeat; width:18px; height:15px; display:block;} @@ -605,11 +574,8 @@ a:hover.sy_class_ltitle{ color:#333;} .hw_more_txt {width:75px; font-size:12px; color:#616060; background-color:#fff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-40px; top:15px; padding:5px 0px; display:none; box-shadow: 0px 0px 8px rgba(146, 153, 169, 0.5); z-index:1000;} .hw_more_txt li a.hw_more_li {font-size:12px;color:#888; display:block; width:75px;height:24px;line-height:24px;text-align:center; } .hw_more_txt li a.hw_more_li:hover {background-color:#f0f0f0;} -.hw_search_box{ position:relative; } -.hw_search_box input.hw_search-input{ width:293px; height:28px; border:none; border:1px solid #e7e7e7; background:#fff; padding-left:5px;} .hw_search_box span.hw_btn_search{display:block; width:20px; height:20px; background:url(../images/hw/icons_hw.png) 0 -57px no-repeat; position:absolute; right:5px; top:15px;} /*.hw_search_box a:hover.hw_btn_search{background:url(../images/hw/icons_hw.png) -40px -57px no-repeat;}*/ -.hw_files_icon{display:block; width:17px; height:14px; background:url(../images/hw/icons_hw.png) 0 -135px no-repeat;} .hw_list_classname{ width:300px; overflow:hidden; display:block;overflow:hidden;white-space: nowrap; text-overflow:ellipsis;} .syllabus_course_name{ width:450px; overflow:hidden; display:block;overflow:hidden;white-space: nowrap; text-overflow:ellipsis;} .hw_list_teachername{ width:80px; overflow:hidden; display:block;overflow:hidden;white-space: nowrap; text-overflow:ellipsis;} @@ -669,5 +635,4 @@ a:hover.sy_class_ltitle{ color:#333;} .sy_tips_box:hover .sy_tips_box_inner{ display: block;} .sy_tips_box_inner{ position: absolute;line-height: 2.0;padding: 5px 10px; white-space: nowrap; background-color: #fff; left:30px; top: -5px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);} .sy_tips_box_inner span { display: block; border-width: 10px;position: absolute;top: 15px; left: -18px; border-style: dashed solid dashed dashed;border-color: transparent #fff transparent transparent;font-size: 0;line-height: 0;} -.hw_search_box a.hw_btn_search{display:block; width:20px; height:20px; background:url(../images/hw/icons_hw.png) 0 -57px no-repeat; position:absolute; right:5px; top:5px;}