From de62798d4dc0139e5975831f27728dced7a22fe6 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 29 Sep 2015 13:54:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E8=B5=9E=E6=8C=89=E9=92=AE=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/memos/_praise_tread.html.erb |  2 +-
 app/views/memos/show.html.erb          | 12 +++++++-----
 public/stylesheets/new_user.css        |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/views/memos/_praise_tread.html.erb b/app/views/memos/_praise_tread.html.erb
index 17af4b090..13287836e 100644
--- a/app/views/memos/_praise_tread.html.erb
+++ b/app/views/memos/_praise_tread.html.erb
@@ -2,7 +2,7 @@
    <% if User.current.logged? %>
     <% if horizontal %>
         <!-- 横排 -->
-        <div id="praise_tread_<%= obj.id %>" style="float:right;">
+        <div id="praise_tread_<%= obj.id %>" style="float:right; " >
           <% @is_valuate = is_praise_or_tread(obj,user_id)%>
           <% if @is_valuate.size > 0 %> <!-- 评价过   1代表赞 0代表踩 -->
               <% @flag = @is_valuate.first.praise_or_tread %>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index ceb2b8cb1..429ada557 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -58,13 +58,15 @@
         </ul>
       </div>
       <%end%>
-      <div class="postDetailTitle"><a href="javascript:void(0);" class="f14 linkGrey4 fb" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;">主题: <%= @memo.subject%></a></div>
+      <div class="postDetailTitle">
+        <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;">主题: <%= @memo.subject%></a>
+        <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
+        <div class="cl"></div>
+      </div>
+
       <div class="postDetailCreater"><a href="javascript:void(0);" class="linkBlue2" target="_blank"><%= @memo.author.name%></a></div>
       <div class="postDetailDate mb5"><%= format_date( @memo.created_at)%></div>
-       <span id="praise_tread" style="float: right">
-    <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
-  </span>
-      <div class="cl"></div>
+
       <div class="memo-content" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
             <%= @memo.content.html_safe%>
       </div>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 747931f2f..79ed27afa 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -761,7 +761,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailRow {width:720px; border-bottom:1px solid #efefef; padding:15px 0;}
 .postDetailPortrait {width:50px; height:50px; float:left; margin-right:15px;}
 .postDetailWrap {width:580px; float:left;}
-.postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
+.postDetailTitle {width:650px; max-width:650px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
@@ -773,7 +773,7 @@ a.postReplyIcon:hover {background:url(images/post_image_list.png) -40px -29px no
 .postAttIcon:hover {background:url(images/post_image_list.png) 0px -113px no-repeat;}
 .postThemeContainer {width:720px;}
 .postThemeWrap {width:655px; float:left;position: relative}
-.postLikeIcon {background:url(images/post_image_list.png) 0px -42px no-repeat ;float:right; padding-left:18px;}
+.postLikeIcon {background:url(images/post_image_list.png) 0px -42px no-repeat ;float:right; padding-left:18px; margin-right:30px; margin-top:3px;}
 .postLikeIcon:hover {background:url(images/post_image_list.png) 0px -64px no-repeat ;}
 a.AnnexBtn{  background: url(images/homepage_icon2.png) 0px -343px no-repeat !important; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
 a:hover.AnnexBtn{background: url(images/homepage_icon2.png) -90px -343px no-repeat !important; color:#3598db;}