Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

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| %>
             <li >
-              <%= 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" %>
               <span class="w180_h 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 %>
       </span>
               <% unless member.user_id == @project.user_id %>
-                  <a href="javascript:void(0) " class="c_dblue ml15 fl" onclick="$('#member-<%= member.id%>-roles-form').show();$(this).parent().height(110);">编辑</a>
+                  <a href="javascript:void(0) " class="c_setting_blue ml30 fl" onclick="$('#member-<%= member.id%>-roles-form').show();$(this).parent().height(110);">编辑</a>
                   <%= 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%>
             </li>

app/views/projects/settings/_new_repositories.html.erb

@@ -21,7 +21,7 @@
   <% @project.repositories.sort.each do |repository| %>
   <tr class="<%= cycle 'pro_table_on', '' %>">
     <td><a href="javascript:viod(0)" title="<%= repository.identifier %>">
-      <%= link_to  truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?), :class =>"c_blue" %></a></td>
+      <%= link_to  truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?) %></a></td>
     <td> <%= checked_image repository.is_default? %></td>
     <td><%=h repository.scm_name %></td>
     <%if repository.scm_name=="Git"%>

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;}

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;}