From ae094bde2889c9c7ed0f17bc4b3e197024cb4080 Mon Sep 17 00:00:00 2001
From: nieguanghui <hust.ud.hui@gmail.com>
Date: Sat, 28 Dec 2013 13:14:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E7=95=8C=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/index.html.erb                          | 8 +++-----
 app/views/words/_new_respond.html.erb                     | 2 +-
 public/stylesheets/welcome.css                            | 6 +++++-
 public/themes/redpenny-master/stylesheets/application.css | 4 ++++
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 6141a724f..b230c3534 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -98,12 +98,10 @@
 	
 	<div class="left" style="float: left; min-height: 470px; width: 48%;">  
 	<ul class="welcome-message-list">
-		<div class="forum-topic" style="height: 25px;">
-		  <h3 style="color: rgb(21, 188, 207);margin-left: 8px;"><strong>贴吧动态</strong></h3>
-
+		<div class="forum-topic" style="height: 25px; width: 98%; margin-left: 6px;">
+		  <h3 style="color: rgb(21, 188, 207);"><strong>贴吧动态</strong></h3>
 		  <span style="margin-top: -30px;float: right; display: block;"><%= link_to "更多>>", forums_path, :target => "_blank" %></span>
 		</div>
-		
 		<div class="welcome-box-list-new">
 			<% find_new_forum_topics(8).each do |topic|%>
 			<li class="message-brief-intro" style="min-height: 25px;padding-bottom:3px;">
@@ -126,7 +124,7 @@
 
 	<div class="right" style="float: right; min-height: 470px; width: 48%; ">	
 		<ul class="user-welcome-message-list">
-			<h3 style="margin-left: -5px; color: rgb(21, 188, 207)"><strong>用户动态</strong></h3>
+			<h3 style="color: rgb(21, 188, 207)"><strong>用户动态</strong></h3>
 			<span style="margin-top: -30px;float: right; display: block;"><%= link_to "更多>>", { :controller => 'users', :action => 'index'}, :target => "_blank"  %></span>
 			<div class="user-message-box-list">
 			<% find_all_activities.each do |event| %>
diff --git a/app/views/words/_new_respond.html.erb b/app/views/words/_new_respond.html.erb
index 43049c604..e803eb305 100644
--- a/app/views/words/_new_respond.html.erb
+++ b/app/views/words/_new_respond.html.erb
@@ -23,7 +23,7 @@ function setMaxLength() {
 function checkMaxLength() {
     var maxLength = this.getAttribute('maxlength');
     var currentLength = this.value.length;
-    if (currentLength > maxLength)
+    if (currentLength >= maxLength)
         this.relatedElement.className = 'toomuch';
     else
         this.relatedElement.className = '';	
diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css
index 7eeea1b00..fcbe12d58 100644
--- a/public/stylesheets/welcome.css
+++ b/public/stylesheets/welcome.css
@@ -87,9 +87,13 @@ ul.welcome-message-list{
 .welcome-message-list h3, .user-welcome-message-list h3 {
 	border-bottom: 1.5px solid rgb(21, 165, 200);
 	padding: 2px;
-	margin-left: 10px;
+	/*margin-left: 10px;*/
 	font-size: 16px;
 }
+
+.user-message-box-list {
+	margin-left: 6px;
+}
 /*鍚勭鍒楄〃鏄剧ず*/
 .d-p-index-box{
     /*border: 1px solid #e6e6e6;*/
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index f57d10552..25d46c7dd 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -2150,4 +2150,8 @@ ul.messages-for-user-reply li {
 
 .counter {
 	float: left;
+}
+
+.toomuch {
+	color: red;
 }
\ No newline at end of file