项目加载慢时,有白色块显示bug修复

This commit is contained in:
Tim 2016-09-29 14:24:42 +08:00
parent 6f8957ee99
commit 858348298b
10 changed files with 12 additions and 11 deletions

View File

@ -36,5 +36,5 @@
<% html_title(l(:label_calendar)) -%> <% html_title(l(:label_calendar)) -%>
<script> <script>
$("#RSide").css("width","730px"); $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
</script> </script>

View File

@ -319,5 +319,5 @@
<% end %> <% end %>
<script> <script>
$("#RSide").css("width","730px"); $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
</script> </script>

View File

@ -89,7 +89,7 @@
</div> </div>
<div id="RSide" class="fl"> <div class="fl">
<%= render_flash_messages %> <%= render_flash_messages %>
<%= yield %> <%= yield %>
<%= call_hook :view_layouts_base_content %> <%= call_hook :view_layouts_base_content %>

View File

@ -50,5 +50,5 @@ function checkMaxLength() {
<% html_title(l(:label_project_tool_response)) -%> <% html_title(l(:label_project_tool_response)) -%>
<script> <script>
$("#RSide").css("width","730px"); $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
</script> </script>

View File

@ -1,4 +1,4 @@
<%= render :partial => "pull_requests/pull_request_container" %> <%#= render :partial => "pull_requests/pull_request_container" %>
<ul id="mergeBanner" class="project-merge-banner"> <ul id="mergeBanner" class="project-merge-banner">
<li class="active"><%= link_to "待处理<span class='project-number-dot'>#{@requests_opened_count}</span>".html_safe, project_pull_requests_path(:type => "1"), :remote => true %></li> <li class="active"><%= link_to "待处理<span class='project-number-dot'>#{@requests_opened_count}</span>".html_safe, project_pull_requests_path(:type => "1"), :remote => true %></li>
<li><%= link_to "已处理<span class='project-number-dot'>#{@requests_merged_count}</span>".html_safe, project_pull_requests_path(:type => "2"), :remote => true %></li> <li><%= link_to "已处理<span class='project-number-dot'>#{@requests_merged_count}</span>".html_safe, project_pull_requests_path(:type => "2"), :remote => true %></li>
@ -16,7 +16,8 @@
<script> <script>
$("#mergeBanner").parent().css("width","730px"); $("#mergeBanner").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
$("#mergeBanner").parent().before("<div class='homepageRightBanner mb10'><span class='f16 fontGrey3'>Pull Request</span></div>");
$(".project-merge-banner li").click(function(){ $(".project-merge-banner li").click(function(){
$(".project-merge-banner li").removeClass("active"); $(".project-merge-banner li").removeClass("active");

View File

@ -36,7 +36,7 @@
<% end %> <% end %>
<script> <script>
$("#RSide").css("width","730px"); $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
</script> </script>

View File

@ -94,5 +94,5 @@
<% html_title(l(:label_repository)) -%> <% html_title(l(:label_repository)) -%>
<script> <script>
$("#RSide").css("width","730px"); $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
</script> </script>

View File

@ -74,5 +74,5 @@
<%= context_menu issues_context_menu_path %> <%= context_menu issues_context_menu_path %>
<script> <script>
$("#RSide").css("width","730px"); $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
</script> </script>

View File

@ -68,5 +68,5 @@
<% html_title @page.pretty_title %> <% html_title @page.pretty_title %>
<script> <script>
$("#RSide").css("width","730px"); $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
</script> </script>

View File

@ -95,6 +95,6 @@
}); });
}; };
$("#RSide").css("width","730px"); $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
</script> </script>
</div> </div>