From 56452d69f4ec1de78abb70cdbfd5e89da6cfd1a2 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 5 Aug 2016 14:11:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=A7=E5=AF=BC=E8=88=AA=E5=AD=97=E4=BD=93?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=EF=BC=8C=E9=A2=9C=E8=89=B2=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_course_activity_users.html.erb |  4 ++--
 app/views/courses/_course_heroes.html.erb         |  4 ++--
 app/views/layouts/base_courses.html.erb           |  2 +-
 public/stylesheets/css/common.css                 |  6 +++---
 public/stylesheets/sy_public.css                  |  1 -
 public/stylesheets/syllabus.css                   | 14 +++++++-------
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/app/views/courses/_course_activity_users.html.erb b/app/views/courses/_course_activity_users.html.erb
index 8b4df3e83..67ec2ede9 100644
--- a/app/views/courses/_course_activity_users.html.erb
+++ b/app/views/courses/_course_activity_users.html.erb
@@ -3,9 +3,9 @@
       <ul class="rankList">
       <h3 style="font-size: 14px; font-weight: normal;">
         <% if (User.current.logged? && course.open_student == 1) || (User.current.member_of_course?(course)) || User.current.admin? %>
-            <%= link_to "班级活跃度", course_member_path(course, :role => 2, :sort_type => 'act_score'), :class => 'sy_cblack' %>
+            <%= link_to "班级活跃度", course_member_path(course, :role => 2, :sort_type => 'act_score'), :class => 'fontGrey3' %>
         <% else %>
-            班级活跃度
+            <span class="fontGrey7"> 班级活跃度 </span>
         <% end %>
         <a class="sy_cmore fr" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor: pointer; position:relative;">积分规则</a>
         <div class="cl"></div>
diff --git a/app/views/courses/_course_heroes.html.erb b/app/views/courses/_course_heroes.html.erb
index 4699c12d2..bd285f9b0 100644
--- a/app/views/courses/_course_heroes.html.erb
+++ b/app/views/courses/_course_heroes.html.erb
@@ -3,9 +3,9 @@
     <ul class="rankList">
       <h4 style="font-size: 14px; font-weight: normal;">
         <% if (User.current.logged? && course.open_student == 1) || (User.current.member_of_course?(course)) || User.current.admin? %>
-            <%= link_to "班级英雄榜", course_member_path(course, :role => 2), :class => 'sy_cblack' %>
+            <%= link_to "班级英雄榜", course_member_path(course, :role => 2), :class => 'fontGrey3' %>
         <% else %>
-            <span>班级英雄榜</span>
+            <span class="fontGrey7">班级英雄榜</span>
         <% end %>
         <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor:pointer;">积分规则</a></h4>
       <div  style="cursor:pointer;" class="numIntro undis">
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 2972045aa..86a0a5518 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -131,7 +131,7 @@
       <%# 课程英雄榜 %>
       <%= render :partial => 'courses/course_heroes', :locals => {:course => @course} %>
       <div class="sy_class_leftbox mb15" >
-        <h3>班级推荐</h3>
+        <h3 class="fontGrey7">班级推荐</h3>
         <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
       </div>
     </div><!--sy_class_l end-->
diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css
index 7db3c4370..1c7394ed3 100644
--- a/public/stylesheets/css/common.css
+++ b/public/stylesheets/css/common.css
@@ -94,9 +94,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
 .flow_hidden{ width:300px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .white_space{white-space:nowrap;}
 .pr {position:relative;}
-.fontGrey3 {color:#484848;}
-a.linkGrey6 {color:#484848 !important;}
-a.linkGrey6:hover {color:#ffffff !important;}
+
 .markPopup {width:290px; height:auto;  padding:5px 0px 15px 15px; background-color:#ffffff; z-index:1000;}
 .markInput { outline:none; border:1px solid #e6e6e6; height:30px; width:50px; color:#3d3c3c; margin-bottom:10px; text-align:center; margin-right:5px; padding-left:0;}
 .markPercentage {margin:10px 0; border:1px solid #e6e6e6; width:70px; height:30px; outline:none; font-size:12px; color:#3d3c3c;}
@@ -400,6 +398,7 @@ a:hover.c_grey{ color:#333;}
 .fontGrey4{color:#999999;}
 .fontGrey5 {color:#a1a1a1;}
 .fontGrey6 {color:#7a7a7a;}
+.fontGrey7 {color:#555;}
 .fontBlue {color:#3498db;}
 span.newsBlack {color:#4b4b4b; font-size:13px; font-weight:bold}
 a.underline {text-decoration:underline;}
@@ -407,6 +406,7 @@ a.fontBlue {color:#297fb8;}
 .fontBlue2 {color:#269ac9 !important;}
 a.fontGrey {color:#cecece;}
 a.fontGrey2 {color:#888888;}
+a.fontGrey3 {color:#555;}
 a.link-black {color:#000;}
 a.link-black:hover {color:#3b94d6;}
 a.link-blue {color:#3b94d6;}
diff --git a/public/stylesheets/sy_public.css b/public/stylesheets/sy_public.css
index f52fc6699..42365faa4 100644
--- a/public/stylesheets/sy_public.css
+++ b/public/stylesheets/sy_public.css
@@ -4,7 +4,6 @@
 .sy_corange{ color: #ee4a1f;}
 .sy_f14{ font-size: 14px;}
 .sy_f16{ font-size: 16px;}
-a.sy_cgrey{ color: #888;}
 a:hover.sy_cgrey{ color:#ee4a1f;}
 a.sy_corange{ color: #ee4a1f; }
 a:hover.sy_corange{ text-decoration:underline;}
diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css
index dad467c68..d0f8d0286 100644
--- a/public/stylesheets/syllabus.css
+++ b/public/stylesheets/syllabus.css
@@ -399,10 +399,10 @@ a:hover.sy_btn_orange{
 .accordion li > a {
     display: block;
     padding: 0 10px 0 40px;
-    height:49px;
+    height:45px;
     line-height:49px;
-    color: #333;
-    font-size:16px;
+    color: #555;
+    font-size:14px;
     background: #f8f8f8;
     border:1px solid #e5e5e5;
     border-bottom:none;
@@ -425,19 +425,19 @@ a:hover.sy_btn_orange{
     margin-top:15px;
     font-size:12px;
     padding: 0 10px;
-    background: #dbdbdb;
+    background: #ccc;
     -webkit-border-radius: 15px;
     -moz-border-radius: 15px;
     border-radius: 15px;
     margin-left:10px;
-    color: #333;
+    color: #888;
 }
 .accordion > li:hover > a span,
 .accordion > li:target > a span,
 .accordion > li > a.active span {
     margin-left:10px;
-    color: #333;
-    background: #dbdbdb;
+    color: #888;
+    background: #ccc;
 }
 /* Images */
 .accordion > li > a:before {