diff --git a/app/views/pull_requests/_show.html.erb b/app/views/pull_requests/_show.html.erb index 3dd3483a5..4b9bd6b88 100644 --- a/app/views/pull_requests/_show.html.erb +++ b/app/views/pull_requests/_show.html.erb @@ -57,14 +57,14 @@ <% if @type == nil || @type == "1" %> -
+
<%= render :partial => "pull_requests/pull_request_comments" %>
<% end %> -
+
<%= render :partial => "pull_requests/pull_request_commits" %>
-
+
<%= render :partial => "pull_requests/pull_request_changes" %>
diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index bbf5b2f14..e97751817 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -431,7 +431,7 @@ a:hover.btn_newpro_grey,a:active.btn_newpro_grey{ background: #eaeaea;} .table-td-w180{display:inline-block;with:180px; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap;} .table-td-w380{display:inline-block;with:380px; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap;} /*项目简介*/ -.pro_new_info{ border:1px solid #ddd; background-color:#fff;} +.pro_new_info{ border:1px solid #ddd; background-color:#fff; width:100%;} .pro_new_info h2{ background: #fff; font-size: 14px; color: #333; height: 40px; line-height: 40px; padding-left: 15px; border-bottom:1px solid #e5e5e5;} .pro_description_new_info{ border:1px solid #ddd; background-color:#fff;} /*.pro_new_info p{ padding-bottom:2px; padding-left: 15px; color: #666; padding-right: 5px}*/ @@ -485,7 +485,7 @@ p.pro_new_grey{ line-height: 1.9; } .new_roadmap_type_hover{color: #fff;} .new_roadmap_nav_tagnomal{ background-color:#eaeaea; padding:0px 5px;-webkit-border-radius:15px;-moz-border-radius:15px;-o-border-radius:15px;border-radius:15px; font-size:12px;} .new_roadmap_nav_taghover{ padding:0px 5px;-webkit-border-radius:15px;-moz-border-radius:15px;-o-border-radius:15px;border-radius:15px; font-size:12px;background: #6bb1e5; color: #fff;} -.new_roadmap_listbox{ padding:15px;border-bottom:1px solid #dbdbdb;} +.new_roadmap_listbox{width: 970px; 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;}