From cc99120f25c569676ffda13c6fafc9dc924f1880 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 29 Sep 2015 14:34:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E6=A0=B7=E5=BC=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/_forum_list.html.erb  |  2 +-
 app/views/forums/index.html.erb        |  2 +-
 app/views/layouts/base_forums.html.erb | 10 +++---
 public/stylesheets/new_user.css        | 43 +++++++++++++++++++++++---
 4 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/app/views/forums/_forum_list.html.erb b/app/views/forums/_forum_list.html.erb
index 7934a80fe..ec9f4f7de 100644
--- a/app/views/forums/_forum_list.html.erb
+++ b/app/views/forums/_forum_list.html.erb
@@ -10,7 +10,7 @@
                 <a href="<%=  forum_path(forum) %>" class="f16 linkBlue" style="word-break: break-all;word-wrap : break-word ;white-space:pre-wrap;"><%=forum.name.gsub(/(\r\n)/,'<br/>').html_safe %></a>
                 <%#= link_to forum.name.gsub(/(\r\n|\s+)/,'<br/>'), forum_path(forum),:class=>"f16 linkBlue" %>
               </div>
-              <div class="postDes" style="word-break: break-all;word-wrap : break-word ;white-space:pre-wrap;"><%= textAreailizable forum.description%></div>
+              <div class="postDes"><%= textAreailizable forum.description%></div>
               <div class="postCreater">创建者：<a href="<%= user_path( forum.creator)%>" class="linkGrey2" target="_blank"><%= forum.creator.name %></a></div>
               <div class="postDate">创建时间：<%= format_date(forum.created_at) %></div>
             </div>
diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb
index c31790f30..c2997ac25 100644
--- a/app/views/forums/index.html.erb
+++ b/app/views/forums/index.html.erb
@@ -135,7 +135,7 @@
      <div id="new_forum_div" class="mb5" style="display: none">
        <div class="red fl mb10" id="error" style="display: none">error</div>
        <%= form_tag({:controller => 'forums',:action=>'create',:format=>'js'},:method => 'post',:remote=>'true') do  |f| %>
-       <div class="mt15">
+       <div>
          <textarea type="text" name="forum[name]"  id="forum_name" maxlength="80"  class="postCreateInput" onfocus="hideError();" onblur="check_forum_name();" placeholder="输入贴吧名称"  ></textarea>
          <script>
            var textarea = document.getElementById('forum_name');
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index 52309912e..549955538 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -155,11 +155,11 @@
             </div>
             <div class="cl"></div>
             <div class="fontGrey2 mt10"><span id="forum_desc_span" style="word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;"><%= @forum.description.html_safe%></span>
-              <%if @forum.creator.id == User.current.id%>
-                  <a href="javascript:void(0);" onclick="edit_desc();">
-                  <%= image_tag('signature_edit.png',{:width=>12,:height=>12})%>
-                  </a>
-               <%end%>
+              <%#if @forum.creator.id == User.current.id%>
+                  <!--<a href="javascript:void(0);" onclick="edit_desc();">-->
+                  <%#= image_tag('signature_edit.png',{:width=>12,:height=>12})%>
+                  <!--</a>-->
+               <%#end%>
             </div>
             <div class="mt15">
               <div id="forum_tag_list">
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 4027121b4..45058f8c9 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -177,6 +177,41 @@ a.c_green{ color:#28be6c;}
 .b_green{background:#28be6c;}
 .b_w{ background:#fff;}
 
+/*font&color add by Tim*/
+.fontGrey {color:#cecece;}
+.fontGrey2 {color:#888888;}
+.fontGrey3 {color:#484848;}
+.fontBlue {color:#3498db;}
+a.underline {text-decoration:underline;}
+a.fontBlue {color:#297fb8;}
+a.fontGrey {color:#cecece;}
+a.fontGrey2 {color:#888888;}
+a.linkOrange {color:#ff7143;}
+a.linkBlue {color:#269ac9;}
+a.linkBlue:hover {color:#297fb8;}
+a.linkBlue2 {color:#3498db;}
+a.linkBlue2:hover {color:#297fb8;}
+a.buttonBlue {background-color:#269ac9;}
+a.buttonBlue:hover {background-color:#297fb8;}
+a.linkGrey {color:#484848;}
+a.linkGrey:hover {color:#269ac9;}
+a.linkGrey2 {color:#888888;}
+a.linkGrey2:hover {color:#484848;}
+a.linkGrey3 {color:#484848;}
+a.linkGrey3:hover {color:#000000;}
+a.linkGrey4 {color:#484848;}
+a.linkGrey4:hover {color:#297fb8;}
+a.linkGrey5 {color:#484848;}
+a.linkGrey5:hover {color:#3498db;}
+a.linkGrey6 {color:#484848 !important;}
+a.linkGrey6:hover {color:#ffffff !important;}
+a.linkGrey7 {color:#888888;}
+a.linkGrey7:hover {color:#269ac9;}
+a.bBlue {background-color:#3498db;}
+a.bBlue:hover {background-color:#297fb8;}
+a.submit_btn {border:1px solid #3498db; padding:3px 10px; border-radius:3px; color:#3498db;}
+a.submit_btn:hover {background-color:#3498db; color:#ffffff;}
+
 /****翻页***/
 .wlist{float:right;}
 .wlist li{float:left;}
@@ -592,7 +627,7 @@ a.postTypeGrey {color:#888888;}
 a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostBrief {width:710px; margin:0px auto; position:relative;}
 .homepagePostPortrait {float:left; width:42px;}
-.homepagePostDes {float:left; width:645px; margin-left:15px;}
+.homepagePostDes {float:left; width:645px; margin-left:15px; overflow:hidden;}
 .homepagePostTo {font-size:14px; color:#484848; margin-bottom:5px;}
 .homepagePostTitle {font-size:14px; color:#484848; margin-bottom:5px; font-weight:bold;}
 .homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;}
@@ -729,7 +764,7 @@ a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;}
 
 
 /*创建贴吧样式*/
-.postContainer {width:968px; border:1px solid #dddddd; padding:15px; background-color:#ffffff; margin-top:15px;}
+.postContainer {width:968px; border:1px solid #dddddd; padding:15px; background-color:#ffffff;}
 .postBanner {height:30px; width:970px; border-bottom:1px solid #efefef;}
 .postSort {width:40px; float:left; margin-top:5px; padding-left:5px;}
 a.sortArrowDown {background:url(images/post_image_list.png) 0px 0px no-repeat; width:7px; height:9px; float:left; margin-left:5px; margin-top:5px;}
@@ -745,7 +780,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDes {width:690px; max-width:690px; margin-bottom:6px; color:#484848;}
 .postCreater {color:#888888; font-size:12px; float:left; margin-right:40px;}
 .postDate {color:#888888; font-size:12px;}
-.postStatics { margin-top:28px; color:#888888; float:right;}
+.postStatics { margin-top:28px; color:#888888; float:right; text-align:center;}
 .slice {width:1px; height:25px; background-color:#d1d1d1; float:right; margin-top:35px; margin-right:20px;}
 .pageRoll {float:right; border-left:1px solid #dddddd; margin-top:15px;}
 .pageCell {border:1px solid #dddddd; border-width:1px 1px 1px 0px; padding:5px 12px; float:left; border-spacing:0px;}
@@ -756,7 +791,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 /*贴吧内部样式*/
 .postDetailContainer {padding:15px; border:1px solid #dddddd; background-color:#ffffff;}
 .postlabel {background-color:#edf1f2; color:#888888; padding:2px 5px; float:left; margin-bottom:5px;}
-.postRightContainer {width:718px; border:1px solid #dddddd; padding:15px; background-color:#ffffff; float:left;} /* margin-top:15px;*/
+.postRightContainer {width:718px; border:1px solid #dddddd; padding:15px; background-color:#ffffff; float:left; margin-bottom:10px;}
 .postDetailBanner {height:30px; width:720px; border-bottom:1px solid #efefef;}
 .postDetailRow {width:720px; border-bottom:1px solid #efefef; padding:15px 0;}
 .postDetailPortrait {width:50px; height:50px; float:left; margin-right:15px;}