From b222b7a8ede13888841009f34ef5c94c8bc80345 Mon Sep 17 00:00:00 2001
From: zhuhao
Date: Mon, 24 Nov 2014 09:21:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E8=AE=A8=E8=AE=BA?=
=?UTF-8?q?=E5=8C=BA=E5=8F=91=E5=B8=96=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/boards/_project_show.html.erb | 5 +++--
app/views/tags/_tag.html.erb | 5 +++--
public/stylesheets/application.css | 5 +++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 8128797c0..81b1f6a8f 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -18,8 +18,9 @@
<%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
<%= render :partial => 'messages/form', :locals => {:f => f} %>
-
- <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;', :class => 'whiteButton m3p10' %>
+
+ <%= l(:button_submit)%>
+ <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;', :class => 'ButtonColor m3p10' %>
<% end %>
<% end %>
diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb
index 63592d91a..c0217c925 100644
--- a/app/views/tags/_tag.html.erb
+++ b/app/views/tags/_tag.html.erb
@@ -1,3 +1,4 @@
+
<%#begin
1 代表是user类型
@@ -76,9 +77,9 @@
<%= f.text_field :name ,:id => "tags_name",:size=>"28",:require=>true,:maxlength => Setting.tags_max_length,:minlength=>Setting.tags_min_length %>
<%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
- <%= f.submit l(:button_project_tags_add),:class => "ButtonAddTags" %>
+ <%= f.submit l(:button_project_tags_add),:class => "ButtonAddTags" %>
+
<%= link_to_function l(:button_cancel), '$("#put-tag-form").hide();',:class=>'ButtonColor'%>
-
<% end %>
<% end %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 1b1580d8c..140b8e5d3 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1580,7 +1580,7 @@ form {display: inline;}
/*added by bai*/
input[type="submit"].bid_btn {
padding-bottom: 5px;
- width: 50px;
+ width: auto;
height: 25px;
text-align: center;
font-family: '微软雅黑', Arial, Helvetica, sans-serif;
@@ -1607,12 +1607,13 @@ input[type="submit"].ButtonAddTags {
text-align: center ;
margin:0 auto;
border-radius: 0px !important;
- background: #15bccf;
+ background: #15bccf ;
border: 0px solid #15bccf !important;
position: relative;
top:3px;
+
}
input[type="button"].bid_btn {