From c9bfe00a4f3a947ad2f90c2bae696561f0e50ee6 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 23 Apr 2015 15:31:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=91=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=8E=92=E5=88=97=20=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=BA=93=E9=A1=B5=E9=9D=A2=E8=89=B2=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/settings/_new_members.html.erb | 6 +++--- app/views/projects/settings/_new_repositories.html.erb | 2 +- public/stylesheets/project.css | 6 +++--- public/stylesheets/public.css | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb index 0aa558014..5e2c9f603 100644 --- a/app/views/projects/settings/_new_members.html.erb +++ b/app/views/projects/settings/_new_members.html.erb @@ -16,7 +16,7 @@ <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %> <% members.each do |member| %>
  • - <%= link_to_user_header member.principal,false,:class => "w140_h c_orange fl" %> + <%= link_to_user_header member.principal,false,:class => "w140_h c_setting_blue fl" %> <%= h member.roles.sort.collect(&:to_s).join(', ') %> <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member), @@ -43,10 +43,10 @@ <% end %> <% unless member.user_id == @project.user_id %> - 编辑 + 编辑 <%= delete_link membership_path(member), :remote => true, - :class => "c_dblue ml15 fl", + :class => "c_setting_blue ml15 fl", :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_for_project_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %> <% end%>
  • diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index 13daa2c2b..e6a0ac296 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -21,7 +21,7 @@ <% @project.repositories.sort.each do |repository| %> - <%= link_to truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?), :class =>"c_blue" %> + <%= link_to truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?) %> <%= checked_image repository.is_default? %> <%=h repository.scm_name %> <%if repository.scm_name=="Git"%> diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index ea0114441..9c2df404b 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -56,7 +56,7 @@ a.invi_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40p a:hover.invi_search_btn{ background:#0da1b2; border:1px solid #0da1b2;} .rolebox{ margin:10px 0;} .w180_h{ width:180px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; text-align:left;} -.w140_h{ width:135px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;text-align:left; padding-left:5px;} +.w140_h{ width:119px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;text-align:left; padding-left:5px;} /*问题跟踪*/ .problem_top{ margin:10px 0 ;} @@ -394,14 +394,14 @@ blockquote { .box ul li{ line-height:1.9;} .members_left{ float:left; width:410px; margin-right:20px; text-align:center;} .members_left{} -.members_left ul li{ height:30px; border-bottom:1px solid #E4E4E4; width:410px; padding-top:10px; } +.members_left ul li{ height:22px; border-bottom:1px solid #E4E4E4; width:410px; padding-top:5px; } .members_left ul li a{ float:left; text-align:left;} .members_left ul li span{ float:left; text-align:center; color:#484747;text-align:left;} .w150{ text-align:center; width:150px;} .f_b{ font-weight: bold;} .members_right{ float:left; width:240px;} .members_right label{ margin-left:15px;} -.members_jion{ background:#f0fbff; padding:10px; height:200px; margin-bottom:10px;} +.members_jion{ background:#f0f0f0; padding:10px; height:200px; margin-bottom:10px;} .members_add{ padding-left:10px; } .member_search_input{ border:1px solid #15bccf; background:#fff; width:170px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;} .member_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 55e36e8a9..e07efadd5 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -105,6 +105,7 @@ a:hover.c_orange{color: #d33503;} a.c_lorange{color:#ff9900;} a:hover.c_lorange{color:#fff;} a.c_blue{ color:#15bccf;} +a.c_setting_blue{color: #0781B4} a.c_dblue{ color:#09658c;} a:hover.c_dblue{ color:#15bccf;} a.c_white{ color:#fff;}