From 3e78dec32ae9d4badf89fc9c1d651170bb27f00b Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 25 Aug 2016 16:07:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=86=E8=AF=BE=E7=A8=8B=E3=80=81?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=85=AC=E7=94=A8=E7=B1=BB=E6=94=BE=E8=87=B3?= =?UTF-8?q?public.css=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/css/project.css | 29 +---------------------------- public/stylesheets/css/public.css | 29 ++++++++++++++++++++++++++++- public/stylesheets/sy_public.css | 15 --------------- public/stylesheets/syllabus.css | 11 ----------- 4 files changed, 29 insertions(+), 55 deletions(-) diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index 3f23f0b80..89412d397 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -554,31 +554,4 @@ a:hover.upload_btn_grey{background:#8a8a8a;} .icons_project_favorite {background: url(/images/syllabus/sy_icons_star.png) 0px 0px no-repeat; width:20px; height:20px; display:block; float:left;} .icons_project_star{background: url(/images/syllabus/sy_icons_star.png) 0px -27px no-repeat; width:20px; height:20px; display:block; float:left;} .new_projectlist_more{ text-align:center;} -.new_projectlist_more a:hover{ color:#3b94d6;} -/*新版项目引用的新版课程大纲中的公共样式*/ -.icons_tishi{ - width: 110px; - height: 110px; - margin: 135px auto 20px; -} -.sy_tab_con_p{ - font-size: 16px; - text-align: center; - margin-bottom:100px; - color:#888; -} -a.sy_btn_green{ - display:inline-block; - color: #fff; - background: #60b25e; - text-align: center; - font-size: 12px; - padding:0 15px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; -} -a:hover.sy_btn_green{ background: #51a74f;} \ No newline at end of file +.new_projectlist_more a:hover{ color:#3b94d6;} \ No newline at end of file diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css index f9d344cf3..78bff0136 100644 --- a/public/stylesheets/css/public.css +++ b/public/stylesheets/css/public.css @@ -1418,4 +1418,31 @@ a:hover.comment_ding_link{ color:#269ac9;} } a.syllabusbox_a_blue{ color:#3b94d6 !important; -} \ No newline at end of file +} + +.icons_tishi{ + width: 110px; + height: 110px; + margin: 135px auto 20px; +} +.sy_tab_con_p{ + font-size: 16px; + text-align: center; + margin-bottom:100px; + color:#888; +} +a.sy_btn_green{ + display:inline-block; + color: #fff; + background: #60b25e; + text-align: center; + font-size: 12px; + padding:0 15px; + height: 30px; + line-height: 30px; + -webkit-border-radius:3px; + -moz-border-radius:3px; + -o-border-radius:3px; + border-radius:3px; + } +a:hover.sy_btn_green{ background: #51a74f;} \ No newline at end of file diff --git a/public/stylesheets/sy_public.css b/public/stylesheets/sy_public.css index deeb36c15..454bdcb4a 100644 --- a/public/stylesheets/sy_public.css +++ b/public/stylesheets/sy_public.css @@ -109,21 +109,6 @@ a:hover.btn_green_big{ background: #60b25e; color: #fff; } -a.sy_btn_green{ - display:inline-block; - color: #fff; - background: #60b25e; - text-align: center; - font-size: 12px; - padding:0 15px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; -} -a:hover.sy_btn_green{ background: #51a74f;} /*a.sy_btn_grey{*/ /*color: #333;*/ diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css index 95cee0b2c..9581724ec 100644 --- a/public/stylesheets/syllabus.css +++ b/public/stylesheets/syllabus.css @@ -169,17 +169,6 @@ a.syllabus_class_title{ font-size:14px; color:#333; max-width:480px; margin-bott border-bottom:none; } /* 课程大纲 */ -.icons_tishi{ - width: 110px; - height: 110px; - margin: 135px auto 20px; -} -.sy_tab_con_p{ - font-size: 16px; - text-align: center; - margin-bottom:100px; - color:#888; -} .sy_classlist{ padding: 15px 15px; border-bottom: 1px dashed #e6e6e6; From fbad4ecd8a806fc16454aa24733a0bf035867041 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 25 Aug 2016 17:52:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E9=A1=B5=E9=9D=A2logo?= =?UTF-8?q?=E5=8F=8A=E8=A1=8C=E9=97=B4=E8=B7=9D=E8=B0=83=E6=95=B4=EF=BC=9B?= =?UTF-8?q?=E6=B5=8B=E5=AF=BC=E8=88=AA=E6=95=B0=E5=AD=97=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_course_base_info.html.erb | 4 ++-- public/stylesheets/syllabus.css | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/views/layouts/_course_base_info.html.erb b/app/views/layouts/_course_base_info.html.erb index 09832b66c..96edea2f3 100644 --- a/app/views/layouts/_course_base_info.html.erb +++ b/app/views/layouts/_course_base_info.html.erb @@ -30,7 +30,7 @@

邀 请 码
@@ -54,7 +54,7 @@

-

+

主讲老师：<%= link_to(@course.teacher.show_name, user_path(@course.teacher), :class => 'sy_cblue') %> 学时：<%= @course.class_period %>学时 学期：<%= current_time_and_term @course %> diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css index 9581724ec..d6e7c19e9 100644 --- a/public/stylesheets/syllabus.css +++ b/public/stylesheets/syllabus.css @@ -314,16 +314,16 @@ a.sy_class_option:hover { } .sy_class_logo{ - width:110px; - height:110px; + width:96px; + height:96px; } .sy_class_id{ - width:108px; - height:78px; + width:94px; + height:70px; border:1px solid #f1f1f1; background:#fff; text-align:center; - padding-top:30px; + padding-top:24px; } .sy_class_id p{ font-size:16px; @@ -369,7 +369,7 @@ a.sy_class_option:hover { line-height: 22px; } -.sy_class_titbox{margin-bottom:5px; padding-top:10px; } +.sy_class_titbox{ padding-top:5px; } a.sy_btn_orange{ display:block; border:1px solid #ee4a1f; @@ -419,9 +419,9 @@ a:hover.sy_btn_orange{ .accordion li > a span { margin-top:15px; - font-size:12px; + font-size:11px; padding: 0 10px; - background: #ccc; + background: #eee; -webkit-border-radius: 15px; -moz-border-radius: 15px; border-radius: 15px; @@ -433,7 +433,7 @@ a:hover.sy_btn_orange{ .accordion > li > a.active span { margin-left:10px; color: #888; - background: #ccc; + background: #ddd; } /* Images */ .accordion > li > a:before {