From fd9eaa93d62e03b7c15290c6d6d03549bb496cb9 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Mar 2015 17:43:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E6=B7=BB=E5=8A=A0+=E5=8F=B7?= =?UTF-8?q?=EF=BC=9B=E5=8E=BB=E6=8E=89css=E6=96=87=E4=BB=B6=E4=B8=AD?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=AC=A6=E5=8F=B7=E5=BC=95=E8=B5=B7=E7=9A=84?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/watchers_helper.rb | 2 +- config/locales/projects/zh.yml | 1 + public/stylesheets/application.css | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index bff7831d1..ed92f7cab 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -295,7 +295,7 @@ module WatchersHelper watched = objects.any? {|object| object.watched_by?(user)} @watch_flag = objects.first.instance_of?(Project) text = @watch_flag ? - (watched ? l(:button_unfollow) : l(:button_follow)) : (watched ? l(:button_unwatch) : l(:button_watch)) + (watched ? l(:button_unfollow) : l(:label_button_following)) : (watched ? l(:button_unwatch) : l(:label_button_following)) url = watch_path(:object_type => objects.first.class.to_s.underscore, :object_id => (objects.size == 1 ? objects.first.id : objects.map(&:id).sort)) method = watched ? 'delete' : 'post' diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 5b888de09..5c46be17f 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -36,6 +36,7 @@ zh: label_project_id: "项目ID:" label_apply_project: "+申请加入" + label_button_following: "+关注" label_exit_project: 退出项目 label_apply_project_waiting: 已处理申请，请等待管理员审核 label_unapply_project: 取消申请 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 1270f6bcf..4db4a462f 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -73,9 +73,9 @@ a:hover.subnav_green{ background:#14ad5a;} .course_description_none{max-height: none;} .lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;} .lg-foot:hover{ color:#787b7e;} -. + /****标签(和资源库的tag样式一致)***/ -.project_Label{ width:220px; padding-left:10px; padding-right:10px; background:#fff; margin-top:10px;} +.project_Label{ width:220px; padding-left:10px !important; padding-right:10px; background:#fff; margin-top:10px;} a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;} .submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat 0 0;width:42px; margin-top:2px; margin-left:3px; } .isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;}