提交历史现实样式整体变更 版本库中提交详情也现实样式调整

app/views/pull_requests/_show.html.erb

@@ -23,7 +23,7 @@
       <span class="fl ml10">最近更新：<%= format_time(@request.updated_at) %></span>
       <p class="fr">
         <%= find_gitlab_project(@request.source_project_id)+"/"+@request.source_branch %><span class="c_grey02 ml10 mr10">合并到</span><%= find_gitlab_project(@request.target_project_id)+"/"+@request.target_branch %>
-        
+
       </p>
     </div>
   </div>

app/views/repositories/_commit_details.html.erb

@@ -12,4 +12,7 @@
         <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %> 前</time>&nbsp;
       </div>
   <% end %>
+  <% if params[:action] == "commit_diff" %>
+      <div class="fr">Commit<a class="ml5" style="color: #3498db"><%= changeset.id %></a></div>
+  <% end %>
 </div>

app/views/repositories/commit_diff.html.erb

@@ -1,16 +1,27 @@
 <div class="container-big">
-  <div class="project_r_h">
+  <div class="new_roadmap_conbox mb10" >
-    <%= render :partial => "top" %>
+    <div class="new_roadmap_info_top clear  ">
+      <%= link_to "<span class='new_roadmap_icons_back mr5'></span>返回提交历史".html_safe, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev, :page => 1}, :class => "fl linkBlue2 mt3" %>
+      <!--<a href="javascript:void(0);" class="fl linkBlue2 mt3" ><span class="new_roadmap_icons_back mr5"></span>返回提交历史</a>-->
+    </div>
+    <div class="clear new_roadmap_listbox_commit">
+      <div class="c_grey02 mb10">
+        <p><%= @commit_details.message %></p>
+      </div>
+      <!--<div class=" clear mb10">-->
+        <!--<p class="fb">关联Issue:</p>-->
+        <!--<a href="javascript:void(0);" class="btn-small fl mr10">#123</a>-->
+        <!--<a href="javascript:void(0);" class="btn-small fl mr10">#123</a>-->
+        <!--<a href="javascript:void(0);" class="btn-small fl mr10">#123</a>-->
+      <!--</div>-->
+      <li class="commit js-toggle-container">
+        <%= render :partial => 'commit_details', :locals => {:changeset => @commit_details} %>
+      </li>
+    </div>
   </div>
-  <div class="showing-changes-info fontGrey2"> Commit <a href="javascript:void(0);" class="linkGrey3">
+
-    <%= @commit_details.id %></a><br />
-    <li class="commit js-toggle-container">
-      <%= render :partial => 'commit_details', :locals => {:changeset => @commit_details} %>
-    </li>
-  </div>
-  <div class="showing-changes-project f14"><%= @commit_details.message %></div>
   <% @commit_diff.each do |commit_diff| %>
-      <div class="showing-changes-row fontGrey2">
+      <div class="showing-changes-row-commit fontGrey2">
         <a href="javascript:void(0);" class="linkGrey3" id="changed-files">
           <img src="/images/vlicon/file.png" width="18" height="20" style="vertical-align:middle;" class="mr5" /><%= commit_diff.new_path %>
         </a>

public/stylesheets/css/project.css

@@ -399,6 +399,7 @@ tr.open span.expander {background-image: url(/images/bullet_toggle_minus.png);}
 .showing-changes-info {width:710px; padding:10px; padding-top: 0px; background-color:#ffffff; line-height:2;}
 .showing-changes-project {padding:10px; border-top:1px solid #dce0e6; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;}
 .showing-changes-row {padding:10px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;}
+.showing-changes-row-commit {padding:10px; border:1px solid #dbdbdb; background-color:#f1f1f1;border-bottom: none}
 #changed-files-detail {display:none;}
 #changed-files-detail li {list-style-type:disc; margin-left:15px;}
 .showing-changes-detail {width:670px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;}
@@ -951,6 +952,7 @@ p.pro_new_grey{ line-height: 1.9; }
 .undis {display:none;}
 .dis {display:block;}
 .new_roadmap_listbox{ padding:15px;border-bottom:1px solid #dbdbdb;}
+.new_roadmap_listbox_commit{ padding:15px;}
 .new_roadmap_listtitle a{ color: #333;display:block;max-width:800px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
 .new_roadmap_listtitle a:hover{ color:#3498db;}
 .new_roadmap_list_txt{ color: #666;}
@@ -998,7 +1000,7 @@ a.sortdownbtn{background: url(/images/sy/liststyle.png) 0 -12px no-repeat; width
 a.pullreques_reply_name{ font-weight: bold; color: #333;}
 .pullreques_reply_txt{ width: 900px;color: #666;}
 .pullreques_pull_top { width: 100%; height: 40px; line-height: 40px; background: #f4f4f4; border-top:1px solid #e1e1e1;border-bottom:1px solid #e1e1e1;}
-a.pullreques_pull_name{display: block; margin-left: 10px;max-width:80px; color:#3b94d6 !important; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
+a.pullreques_pull_name{display: block; margin-left: 5px;max-width:80px; color:#3b94d6 !important; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
 .pullreques_pull_list li{ height: 30px; line-height: 30px; }
 .pullreques_pull_txt{display: block; margin-left: 10px;max-width:740px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
 .pullreques_change_list li{height: 40px; line-height: 40px;border-bottom:1px solid #e1e1e1; }