From edd03d05d04f130c6aab46c786299d9fac6bca51 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 27 Sep 2016 14:03:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=8E=86=E4=B8=ADissue=E5=8F=B7?=
 =?UTF-8?q?=E4=B8=8E=E5=AE=8C=E6=88=90=E5=BA=A6=E8=B6=85=E5=87=BA=E8=BE=B9?=
 =?UTF-8?q?=E6=A1=86=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/issues_helper.rb        | 4 ++--
 app/views/calendars/show.html.erb   | 6 ------
 app/views/common/_calendar.html.erb | 7 +++----
 public/stylesheets/css/project.css  | 2 +-
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 0ab09802f..7aec64718 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -60,9 +60,9 @@ module IssuesHelper
   def states_done_ratio(issue)
     done_ratio = issue.done_ratio
     if done_ratio == 100
-      "<span class='c_green'>#{l(:label_done_ratio_endding)}</span>".html_safe
+      "<span class='c_green' style='display:inline-block;'>#{l(:label_done_ratio_endding)}</span>".html_safe
     else
-      "<span class='c_orange'>#{l(:label_done_ratio_doing)}</span>".html_safe
+      "<span class='c_orange' style='display:inline-block;'>#{l(:label_done_ratio_doing)}</span>".html_safe
     end
   end
 
diff --git a/app/views/calendars/show.html.erb b/app/views/calendars/show.html.erb
index 26ad8501c..05ce3bcac 100644
--- a/app/views/calendars/show.html.erb
+++ b/app/views/calendars/show.html.erb
@@ -5,12 +5,6 @@
 <%= form_tag({:controller => 'calendars', :action => 'show', :project_id => @project},
              :method => :get, :id => 'query_form') do %>
     <%= hidden_field_tag 'set_filter', '1' %>
-    <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
-      <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
-      <div style="<%= @query.new_record? ? "" : "display: none;" %>">
-        <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
-      </div>
-    </fieldset>
     <p style="float:right;">
       <%= link_to_previous_month(@year, @month) %> | <%= link_to_next_month(@year, @month) %>
     </p>
diff --git a/app/views/common/_calendar.html.erb b/app/views/common/_calendar.html.erb
index b2aad3812..2f4c61a77 100644
--- a/app/views/common/_calendar.html.erb
+++ b/app/views/common/_calendar.html.erb
@@ -24,10 +24,9 @@
                         <span class="tip"><%= render_issue_tooltip i %></span>
                         </div>
                     <% else %>
-                         <span class="icon icon-package">
-                        <%= h("#{i.project} -") unless @project && @project == i.project %>
-                        <%= link_to_version i%>
-                        </span>
+                         <span class="icon icon-package"></span>
+                         <%= h("#{i.project} -") unless @project && @project == i.project %>
+                         <%= link_to_version i%>
                     <% end %>
                 <% end %>
                 </td>
diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css
index 4a2ec5683..bfa85c5bd 100644
--- a/public/stylesheets/css/project.css
+++ b/public/stylesheets/css/project.css
@@ -167,7 +167,7 @@ div.thumbnails div {background:#fff;display:inline-block;margin-right:2px;}
 /* 里程碑 */
 .roadmap_box{ background:#f8f8f8; width:648px; padding:10px; margin-top:5px; border:1px solid #ddd; color:#555;}
 .progress{ width:648px; height:20px; margin-bottom:5px; background:#e9e9e9;}
-.closed{ background:#bae0ba; height:20px;}
+.closed{ background:#bae0ba;}
 .done{ background:#d3edd3; display:block;height:20px;float:left;}
 .roadmap_box{ margin-bottom:10px;}
 .roadmap_list_ul{border:1px solid #ddd; border-bottom:none; margin-bottom:10px;}