From 0b5ee5dc4b433ad5d98391b0c763c767853b277e Mon Sep 17 00:00:00 2001 From: zhuhao Date: Thu, 20 Nov 2014 11:38:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=88=E5=8F=91=E5=B8=83=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E9=A1=B5=EF=BC=8C=E6=96=B0=E5=BB=BA=E7=BC=BA?= =?UTF-8?q?=E9=99=B7=E9=A1=B5=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/new.html.erb | 6 +++--- app/views/tags/_tag.html.erb | 5 +++-- public/stylesheets/application.css | 28 +++++++++++++++++++++++++--- public/stylesheets/nyan.css | 19 ++++++++++--------- 4 files changed, 41 insertions(+), 17 deletions(-) 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 ad947dcde..c3a72d627 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..00b322c2d 100644 --- a/public/stylesheets/nyan.css +++ b/public/stylesheets/nyan.css @@ -475,19 +475,21 @@ body { top: 1px; } input[class~='ButtonClolr'],.ButtonColor{ + color: #fffbff !important; padding-bottom: 5px; - width: 40px; - height: 20px; + 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; From 4ae74b560823b797360d8148da4abb05fe8bece7 Mon Sep 17 00:00:00 2001 From: zhuhao Date: Thu, 20 Nov 2014 16:19:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=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 --- public/stylesheets/application.css | 2 +- public/stylesheets/nyan.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index cccc042ce..be26a7fed 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1598,7 +1598,7 @@ input[type="submit"].bid_btn { input[type="submit"].ButtonAddTags { color: #fffbff ; - padding-bottom: 5px; + padding-bottom:5px ; width:auto ; height: 25px ; font-family: '微软雅黑',Arial,Helvetica,sans-serif ; diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css index 00b322c2d..cc5898e0d 100644 --- a/public/stylesheets/nyan.css +++ b/public/stylesheets/nyan.css @@ -477,7 +477,7 @@ body { input[class~='ButtonClolr'],.ButtonColor{ color: #fffbff !important; - padding-bottom: 5px; + padding: 5px; width: auto; height: 24px ; font-family: '微软雅黑',Arial,Helvetica,sans-serif; From cb7cd581f6a14c1101919dc66757cf4b9f034d6e Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Thu, 20 Nov 2014 17:08:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=20Signed-off-by:?= =?UTF-8?q?=20alan=20<547533434@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/account/register.html.erb | 4 ++-- app/views/admin/search.html.erb | 2 +- public/stylesheets/nyan.css | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 @@ <%= format_time(user.created_on) %> <%= format_time(user.last_login_on) unless user.last_login_on.nil? %> <%= 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/public/stylesheets/nyan.css b/public/stylesheets/nyan.css index 27e8a367e..10dbededb 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 { From 81420df6b93a32a0610fb1b72796995a13217a16 Mon Sep 17 00:00:00 2001 From: gonglexin <18008490802@163.com> Date: Thu, 20 Nov 2014 22:04:16 +0800 Subject: [PATCH 4/4] =?UTF-8?q?Fix=20#1523=20=E6=96=B0=E5=BB=BA=E7=BC=BA?= =?UTF-8?q?=E9=99=B7=E6=97=B6=E9=AB=98=E4=BA=AE=E6=98=BE=E7=A4=BA=20TAB=20?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 1 - 1 file changed, 1 deletion(-) 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]