From 5cc40408eea01dd53701b67ea9f80b2a4c48c811 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 30 Jun 2016 16:30:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9KE=E5=8D=95=E5=80=8D=E8=A1=8C?=
 =?UTF-8?q?=E8=B7=9D=E6=98=BE=E7=A4=BA=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/my/zh.yml        | 2 +-
 config/locales/zh.yml           | 2 +-
 public/stylesheets/courses.css  | 3 ++-
 public/stylesheets/new_user.css | 1 +
 public/stylesheets/project.css  | 1 +
 public/stylesheets/public.css   | 1 +
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/config/locales/my/zh.yml b/config/locales/my/zh.yml
index 25a949df4..39c7c3167 100644
--- a/config/locales/my/zh.yml
+++ b/config/locales/my/zh.yml
@@ -28,7 +28,7 @@ zh:
   label_account_identity_choose: --请选择身份--
   label_account_identity_teacher: 教师
   label_account_identity_student: 学生
-  label_account_identity_developer: 开发者
+  label_account_identity_developer: 从业者
   label_account_identity_enterprise: 组织
   label_account_identity_studentID: 请输入学号
 
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 3dbd2e8ef..c80a39891 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1665,7 +1665,7 @@ zh:
   #add by men
   label_account_identity_teacher: 教师
   label_account_identity_student: 学生
-  label_account_identity_developer: 开发者
+  label_account_identity_developer: 从业者
   label_account_identity_enterprise: 组织
 
   label_teaching_course: 我执教的课程
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index d0a5e7ab3..a94e61d1d 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -152,6 +152,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
+.homepagePostIntro p{line-height: 1;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
@@ -1426,4 +1427,4 @@ a.pages-big{ width:50px;}
 .H60 {height:60px !important;}
 .W420 {width:420px;}
 .W300 {width:300px !important;}
-.W600{ width:600px;}
+.W600{ width:600px;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index b931dff6b..a65edc490 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -683,6 +683,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
+.homepagePostIntro p{line-height: 1;}
 .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
 .borderBottomNone {border-bottom:none !important;}
 .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index bde560613..354c0f1ac 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -969,6 +969,7 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
     color: #484848;
     overflow: hidden;
 }
+.homepagePostIntro p{line-height: 1;}
 .homepagePostReply {
     width: 710px;
     margin: 10px auto 0px;
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 500923519..bf7d288a7 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -632,6 +632,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
+.homepagePostIntro p{line-height: 1;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}