From 8f216a6723838ac4d9adf2f95bd0d14433206a3c Mon Sep 17 00:00:00 2001
From: baiyu <whitefeather0126@gmail.com>
Date: Fri, 8 Nov 2013 10:53:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BA=86=E5=90=84=E4=B8=AA?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E6=8C=89=E9=92=AE=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BA=86=E9=83=A8=E5=88=86=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_new.html.erb                  | 43 +++----------------
 app/views/projects/feedback.html.erb          |  2 +-
 config/locales/zh.yml                         |  2 +-
 public/stylesheets/application.css            | 36 +++++++++++++++-
 .../stylesheets/application.css               | 16 +++----
 5 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/app/views/bids/_new.html.erb b/app/views/bids/_new.html.erb
index d57a26d72..cf9f8df30 100644
--- a/app/views/bids/_new.html.erb
+++ b/app/views/bids/_new.html.erb
@@ -1,41 +1,4 @@
 <!-- fq -->
-<style>
-	input[type="submit"].bid_btn {
-		vertical-align: middle;
-		width: 60px;
-		height: 30px;
-		line-height: 18px;
-		font-size: 14px;
-		color: rgb(0, 0, 0);
-		background: url("../images/button/bg103.jpg") no-repeat scroll left top transparent;
-		padding: 0px 0px 4px 0px;
-		border-radius: 2px;
-		border: 1px solid rgb(148, 148, 148);
-		box-shadow: none;
-		text-shadow: none;
-		margin-top: -10px;
-		/*margin-right: -4px;*/
-	}
-	input[type="button"].bid_btn {
-		width: 60px;
-		height: 30px;
-		line-height: 18px;
-		font-size: 14px;
-		color: rgb(0, 0, 0);
-		background: url("../images/button/bg103.jpg") no-repeat scroll left top transparent;
-		padding: 0px 0px 4px 0px;
-		border-radius: 2px;
-		border: 1px solid rgb(148, 148, 148);
-		box-shadow: none;
-		text-shadow: none;
-		margin-top: -10px;
-		margin-right: -2px;
-	}
-	textarea:focus {
-		border: #d5dee9 1px solid;
-	}
-</style>
-
 <script type="text/javascript" language="javascript">
 	function clearInfo(id, content) {
 		var text = $('#' + id);
@@ -73,12 +36,16 @@
 	</tr>
 </table>
 <%= f.text_field :reference_user_id, :style=>"display:none"%>
+
+<!-- modified by bai -->
 <table border="0" width="525px" align="center">
 	<tr>
 		<td align="right"> <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'"%>
-		<%= submit_tag l(:button_clear_requirement), :name => nil, :onclick => "clearMessage('bid_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td>
+		<%= submit_tag l(:button_clear), :name => nil, :onclick => "clearMessage('bid_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td>
 	</tr>
 </table>
+<!-- end -->
+
 <% else %>
 <div style="font-size: 14px;margin:10px;">
 	<%= l(:label_user_login_tips) %>
diff --git a/app/views/projects/feedback.html.erb b/app/views/projects/feedback.html.erb
index ed6a961b6..416ee8978 100644
--- a/app/views/projects/feedback.html.erb
+++ b/app/views/projects/feedback.html.erb
@@ -12,7 +12,7 @@
 		</table>
 		<table border="0" width="525px" align="center">
 			<tr>
-				<td align="right"> <%= submit_tag l(:button_submit), :name => nil , :class => "bid_btn" %></td>
+				<td align="right"> <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "bid_btn" %></td>
 			</tr>
 		</table>
 		<% end %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 305303f53..fa1b47d57 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1358,7 +1358,7 @@ zh:
   label_RMB_sign: ￥
   label_investment_budget: 投资预算：
   label_investment_time_limit: 投资时限：
-  label_my_respond: 我要反馈：
+  label_my_respond: 问题交流请踩这里^-^
   label_my_question: 请在此处留下您的意见或者问题~  # modified by bai
   label_respond_requirement: 对需求进行了反馈
   label_question_requirement: 对作业提出了问题！
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 54e63f1ce..c90e8bed4 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1152,7 +1152,41 @@ margin-left:-10px;
 /*end*/
 .splitcontentright{float:right; width:49%;}
 form {display: inline;}
-input, select {font-family: 微软雅黑;vertical-align: middle; margin-top: 1px; margin-bottom: 1px;} /*modify by men*/
+
+/*added by bai*/
+	input[type="submit"].bid_btn {
+		padding-bottom: 5px;
+	width: 55px;
+	height: 25px;
+    font-family: '微软雅黑',Arial,Helvetica,sans-serif;
+    font-size: 12px;
+    color: #fff;
+    padding: 0px;
+    background: #15bccf; 
+    border-radius: 4px;
+    border: 1px solid #15bccf;
+    box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
+    text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255);
+    cursor: pointer;
+}
+
+input[type="button"].bid_btn {
+		padding-bottom: 5px;
+	width: 55px;
+	height: 25px;
+    font-family: '微软雅黑',Arial,Helvetica,sans-serif;
+    font-size: 12px;
+    color: #fff;
+    padding: 0px;
+    background: #15bccf; 
+    border-radius: 4px;
+    border: 1px solid #15bccf;
+    box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
+    text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255);
+    cursor: pointer;
+	}
+/*end	*/
+	
 fieldset {border: 1px solid #e4e4e4; margin:0;}
 legend {color: #484848;}
 hr { width: 100%; height: 1px; background: #ccc; border: 0; color:#000000;}
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index 92338525f..b0339d866 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -1862,24 +1862,24 @@ div.tableline{
 /* 统一按钮风格 
  * 
  * @2013-09-27
- * added by william */
+ /*added by bai*/
 input[type="submit"] {
-	width: auto;
+	padding-bottom: 5px;
+	width: 55px;
+	height: 25px;
     font-family: '微软雅黑',Arial,Helvetica,sans-serif;
     font-size: 12px;
-    color: rgb(5, 5, 5);
+    color: #fff;
     padding: 0px;
-    background: -moz-linear-gradient(center top , rgb(255, 255, 255) 0%, rgb(235, 235, 235) 50%, rgb(219, 219, 219) 50%, rgb(181, 181, 181)) repeat scroll 0% 0% transparent;
+    background: #15bccf; 
     border-radius: 4px;
-    border: 1px solid rgb(148, 148, 148);
+    border: 1px solid #15bccf;
     box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
     text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255);
     cursor: pointer;
 }
 
-
-
-
+/*end*/
 
 /*added by bai*/
 a.font-user-color{