diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 9e9a34d55..f3c2b199c 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -17,7 +17,6 @@ class IssuesController < ApplicationController layout 'base_projects'#Added by young - menu_item :new_issue, :only => [:new, :create] default_search_scope :issues before_filter :find_issue, :only => [:show, :edit, :update] diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb index 32940d111..21bdd8fa7 100644 --- a/app/views/account/register.html.erb +++ b/app/views/account/register.html.erb @@ -22,12 +22,12 @@
<%= f.password_field :password, :size => 25, :required => true %> <%= l(:text_caracters_minimum, :count => Setting.password_min_length) %>
-<%= f.password_field :password_confirmation, :size => 25, :required => true %>
+<%= f.password_field :password_confirmation, :size => 25, :required => true %>
<% end %><%= f.text_field :mail,:size => 25, :required => true %> - +
diff --git a/app/views/admin/search.html.erb b/app/views/admin/search.html.erb
index 758c7b32f..320fce125 100644
--- a/app/views/admin/search.html.erb
+++ b/app/views/admin/search.html.erb
@@ -54,7 +54,7 @@
<%= change_status_link(user) %>
- <%= delete_link user_path(user, :back_url => admin_users_path(params)) unless User.current == user %>
+ <%= delete_link user_path(user, :back_url => admin_search_path(params)) unless User.current == user %>
<% end -%>
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index 4b0140b1c..efa3adc2e 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -41,9 +41,9 @@
<% end %>
- <%= submit_tag l(:button_create) %>
- <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
- <%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form' %>
+ <%= submit_tag l(:button_create), :class => "ButtonAddTags"%>
+ <%= submit_tag l(:button_create_and_continue), :class => 'ButtonAddTags' %>
+ <%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form','preview',{:class => "ButtonColor"}%>
<%= javascript_tag "$('#issue_subject').focus();" %>
<% end %>
diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb
index 4d3414a1f..63592d91a 100644
--- a/app/views/tags/_tag.html.erb
+++ b/app/views/tags/_tag.html.erb
@@ -76,8 +76,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 => "small" %>
- <%= link_to_function l(:button_cancel), '$("#put-tag-form").hide();'%>
+ <%= 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 f3c99f6b5..1b1580d8c 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1277,7 +1277,7 @@ input#openid_url { background: url(../images/openid-bg.gif) no-repeat; backgroun
.clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
/***** Links *****/
-a, a:link, a:visited{ color: #169; text-decoration: none; }
+a, a:link, a:visited{ color: #169 ; text-decoration: none; }
a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
a img{ border: 0; }
@@ -1580,13 +1580,15 @@ form {display: inline;}
/*added by bai*/
input[type="submit"].bid_btn {
padding-bottom: 5px;
- width: 55px;
+ width: 50px;
height: 25px;
+ text-align: center;
font-family: '微软雅黑', Arial, Helvetica, sans-serif;
font-size: 12px;
color: #fff;
- padding: 0px;
+ padding: 8px;
background: #15bccf;
+ text-align: center;
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;
@@ -1594,6 +1596,25 @@ input[type="submit"].bid_btn {
cursor: pointer;
}
+input[type="submit"].ButtonAddTags {
+ color: #fffbff ;
+ padding-bottom:5px ;
+ width:auto ;
+ height: 25px ;
+ font-family: '微软雅黑',Arial,Helvetica,sans-serif ;
+ font-size: 15px ;
+ font-weight: normal;
+ text-align: center ;
+ margin:0 auto;
+ border-radius: 0px !important;
+ background: #15bccf;
+ border: 0px solid #15bccf !important;
+ position: relative;
+ top:3px;
+
+
+}
+
input[type="button"].bid_btn {
/*padding-bottom: 5px;*/
width: 55px;
@@ -1603,6 +1624,7 @@ input[type="button"].bid_btn {
color: #fff;
padding: 0px;
background: #15bccf;
+ text-align: center;
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;
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index 27e8a367e..50a1de7c4 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -15,7 +15,7 @@ span[id^=valid_user] {
}
.red {
- color: red;margin-left: 10px;margin-right: 10px;text-align: right;
+ color: red;margin-right: 10px;text-align: right;
}
.green {
@@ -475,19 +475,21 @@ body {
top: 1px;
}
input[class~='ButtonClolr'],.ButtonColor{
+
color: #fffbff !important;
- padding-bottom: 5px;
- width: 40px;
- height: 20px;
+ padding: 5px;
+ width: auto;
+ height: 24px ;
font-family: '微软雅黑',Arial,Helvetica,sans-serif;
font-size: 15px;
-
+ text-align: center;
padding: 0px;
- background: #15bccf;
- border: 1px solid #15bccf;
-
+ background: #15bccf !important;
+ border: 0px solid #15bccf ;
+ display:inline-block
}
+
input[class~='whiteButton'], .whiteButton {
-moz-box-shadow: inset 0px 1px 0px 0px #ffffff;
-webkit-box-shadow: inset 0px 1px 0px 0px #ffffff;
@@ -541,7 +543,6 @@ input[class~='m3p10'], .m3p10 {
padding: 3px 10px;
height: 20px;
display: inline-block;
- text-align: center;
color: #ffffff;
}
@@ -648,14 +649,14 @@ input[class='nyan-clean-gray']:active, .nyan-clean-gray:active {
}
.tools a:visited {
- color: #116699;
+ color: #fffbff;
text-decoration: none;
padding: 3px 5px 0px 5px;
width: 100px;
}
.tools a:hover {
- color: white;
+ color: #fffbff;
padding: 3px 3px 0px 20px;
width: 88px;
text-decoration: none;