From 14a6dec46a0de8b1f156dde6d048fbd3cd01f3cd Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 23 Oct 2014 15:44:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=E5=BA=93=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E8=B4=B4=E5=90=A7=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/_forum_list.html.erb | 6 ++----
 public/stylesheets/nyan.css           | 7 ++++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/views/forums/_forum_list.html.erb b/app/views/forums/_forum_list.html.erb
index df897151e..9d0eba923 100644
--- a/app/views/forums/_forum_list.html.erb
+++ b/app/views/forums/_forum_list.html.erb
@@ -1,12 +1,10 @@
 <!-- added by fq -->
-<div style="padding-top: 10px">
+<div class="forums-list">
 <% if forums.any? %>
 	<% forums.each do |forum| %>
 	<div class="forums-index">
 		<div class="forums-inex-avatar">
-          <% unless forum.creator.nil? %>
-              <%= link_to image_tag(url_to_avatar(forum.creator), :class => "avatar"), user_path(forum.creator) %>
-          <% end %>
+              <%= forum.creator.nil? ? (link_to image_tag(url_to_avatar(forum.creator), :class => "avatar")) : (link_to image_tag(url_to_avatar(forum.creator), :class => "avatar"), user_path(forum.creator)) %>
           </div>
 		<div class="forums-index-content">
 			<p ><%= link_to h(forum.name), forum_path(forum) %></p>
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index 1693b3a09..7b35559e6 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -672,7 +672,10 @@ input[class='nyan-clean-gray']:active, .nyan-clean-gray:active {
 
 /* 贴吧 forum memo
 *******************************************************************************/
-
+.forums-list{
+    padding-top: 10px;
+    min-height: 400px;
+}
 div.actions input[type="text"] {
     padding: 3px;
     width: 100%;
@@ -861,8 +864,10 @@ table.content-text-list tbody tr td.locked, div.memo-section .locked {
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     -box-sizing: border-box;
+    min-height: 200px;
 }
 
+
 .resource_sum {
     height: auto;
 }