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

app/views/layouts/base_projects.html.erb

@@ -67,7 +67,7 @@
                                                 <%= text_field_tag 'name', params[:name], :size => 20, :onkeyup => "regexName();" %>
                                                 <%= hidden_field_tag 'project_type', params[:project_type] %>
                                                 <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
-                                                <a href="#" onclick="submitSerch();" class="ButtonColor m3p10" style="padding-top: 7px !important;">
+                                                <a href="#" onclick="submitSerch();" class="ButtonColor m3p10" >
                                                     <%= l(:label_search)%>
                                                 </a>
                                                 <br />

public/stylesheets/application.css

@@ -2899,7 +2899,7 @@ div.repos_explain{
 input[class~='ButtonClolr'],.ButtonColor{
 
     color: #fffbff !important;
-    padding: 5px;
+    /*padding: 5px;*/
     width: auto;
     height: 24px ;
     font-family: '微软雅黑',Arial,Helvetica,sans-serif;