<% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header' %>
<% else%>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index b42bc9523..f2ab0c525 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -58,11 +58,11 @@
-
主题: <%= @memo.subject%>
- <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
-
+
+ <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
+
<%= format_date( @memo.created_at)%>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 95e9fd227..d55da7e75 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -663,7 +663,7 @@ a.postReplyCancel:hover {color:#ffffff;}
.homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;}
.homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}
-a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;}
+a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
.homepagePostReplyPortrait {float:left; width:33px;}
.imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;}
.homepagePostReplyDes {float:left; width:632px; margin-left:15px;}
@@ -796,7 +796,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:650px; max-width:650px; margin-bottom:5px;}
+.postDetailTitle {width:580px; max-width:580px; 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;}
From 81092a7e32b370cb9e3bf390f4d03b0c6c843b33 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 29 Sep 2015 15:24:50 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E8=A1=8C=E9=AB=98=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/stylesheets/prettify.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/stylesheets/prettify.css b/public/stylesheets/prettify.css
index 8e50cf32f..c7d16ffd4 100644
--- a/public/stylesheets/prettify.css
+++ b/public/stylesheets/prettify.css
@@ -43,7 +43,7 @@ pre li,ul,ol {
}
/* Specify class=linenums on a pre to get line numbering */
-ol.linenums { margin-top: 0; margin-bottom: 0;line-height: 10px } /* IE indents via margin-left */
+ol.linenums { margin-top: 0; margin-bottom: 0;line-height: 15px } /* IE indents via margin-left */
li.L0,
li.L1,
li.L2,
From 03436bca2a20c89decb300f15c308fa0775cfaf4 Mon Sep 17 00:00:00 2001
From: cxt
Date: Tue, 29 Sep 2015 15:37:52 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E7=9A=84=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E9=93=BE=E6=8E=A5=E5=8F=AF=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/memos/show.html.erb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index b42bc9523..2df2aee36 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -64,7 +64,8 @@
+ <%= link_to @memo.author.name, user_path(@memo.author), :class => "linkBlue2", :target=> "_blank"%>
From 1613f41e77243d517065edbcabc0465632382ad0 Mon Sep 17 00:00:00 2001
From: Tim
Date: Tue, 29 Sep 2015 15:44:04 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E7=82=B9=E8=B5=9E=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/memos/_praise_tread.html.erb | 2 +-
public/stylesheets/new_user.css | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/views/memos/_praise_tread.html.erb b/app/views/memos/_praise_tread.html.erb
index 13287836e..32b4a0ac0 100644
--- a/app/views/memos/_praise_tread.html.erb
+++ b/app/views/memos/_praise_tread.html.erb
@@ -7,7 +7,7 @@
<% if @is_valuate.size > 0 %>
<% @flag = @is_valuate.first.praise_or_tread %>
<% if @flag == 1 %>
- <%= get_praise_num(obj)%>
+ <%= get_praise_num(obj)%>
<% end %>
<% else %>
<% if user_id == obj.author_id %>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index d55da7e75..ace5cb651 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -808,7 +808,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; margin-right:30px; margin-top:3px;}
+.postLikeIcon {background:url(images/post_image_list.png) 0px -42px no-repeat ;float:right; padding-left:18px; 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;}