From e0cf3bd6de9914688c2e35f10bbb957ab454bb07 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Fri, 14 Nov 2014 10:54:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug<=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?>=20Signed-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/tags_controller.rb | 1 -
 app/views/memos/show.html.erb      | 6 ++++++
 app/views/tags/_tag_name.html.erb  | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 1318e40a5..b64c18b33 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -16,7 +16,6 @@ class TagsController < ApplicationController
   include ActsAsTaggableOn::TagsHelper
   helper :projects
   helper :courses
-  include TagsHelper
   helper :tags
   include OpenSourceProjectsHelper
 
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 017a9a03c..b7e5e2749 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -1,3 +1,9 @@
+<style type="text/css">
+  .reply_content p {
+      margin-top: 13px;
+      margin-bottom: 13px;
+  }
+</style>
 <div class="lz">
   <!-- 在这里添加赞和踩-->
   <span id="praise_tread" style="float: right"> <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> </span>
diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb
index 6996e8891..3efbfcc1a 100644
--- a/app/views/tags/_tag_name.html.erb
+++ b/app/views/tags/_tag_name.html.erb
@@ -7,7 +7,7 @@
     // });
     // })
 </script>
-<!-- 1代表是user类型   2代表是project类型  3代表是issue类型   4代表需求 9代表课程-->
+<!-- 1代表是user类型   2代表是project类型  3代表是issue类型   4代表需求 7代表竞赛 9代表课程-->
 <% @tags = obj.reload.tag_list %>
 
 <% if non_list_all and (@tags.size > 0) %>