From acdb63974fb9e57dc1675d13a6bd3d4f84e3159b Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 30 Sep 2015 10:21:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=B7=E4=BD=93=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A=E7=9A=84=E6=A0=B7=E5=BC=8F?= 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 7979d061a..489f1959b 100644 --- a/public/stylesheets/prettify.css +++ b/public/stylesheets/prettify.css @@ -46,7 +46,7 @@ pre li,ul,ol { ol.linenums { margin-top: 0; margin-bottom: 0;line-height: 15px;margin-left: 0px !important; } /* IE indents via margin-left */ .list_style ol li { list-style-type: decimal; - margin-left: 10px; + margin-left: 10px !important; } li.L0, li.L1, From edf6f8e1f0330c3d9f8733425655c7ef14d26596 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 30 Sep 2015 10:31:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=96=B0=E6=B6=88=E6=81=AF=E6=95=B0?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_logined_header.html.erb | 4 +++- public/stylesheets/header.css | 2 +- public/stylesheets/new_user.css | 2 +- public/stylesheets/public.css | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index 941f8b8e3..d0cbc1f6b 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -94,11 +94,13 @@ +
<%= link_to "", user_message_path(User.current), :class => "homepageNewsIcon" %> <% if User.current.count_new_message >0 %> -
<%= link_to "" , user_message_path(User.current), :class => "newsActive" %>
+
<%= link_to User.current.count_new_message , user_message_path(User.current), :class => "newsActive" %>
<% end %> + <%#= link_to User.current.count_new_message, user_message_path(User.current), :class => "homepageNewsIcon" %>
diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css index 25c2ae211..45f057155 100644 --- a/public/stylesheets/header.css +++ b/public/stylesheets/header.css @@ -14,7 +14,7 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no- #navSearchAlert {display:none;} .navHomepageNews {width:30px; display:block; float:right; margin-top:8px; position:relative;} .homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px no-repeat; width:30px; height:35px; display:block;} -.newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;} +.newsActive {width:16px; height:16px; border-radius:50%; background-color:#ff0000; position:absolute; left:17px; top:5px; text-align:center;font-size:12px; color:#ffffff !important;padding-bottom: 3px;padding-left: 1px;padding-right: 1px;} .navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;} .homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block; line-height:0;} .homepageProfileMenuIconhover {background:url(../images/nav_icon.png) 30px -122px no-repeat;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 5949d44aa..156d0f79c 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -528,7 +528,7 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no- #navSearchAlert {display:none;} .navHomepageNews {width:30px; display:block; float:right; margin-top:8px; position:relative;} .homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px no-repeat; width:30px; height:35px; display:block;} -.newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;} +.newsActive {width:16px; height:16px; border-radius:50%; background-color:#ff0000; position:absolute; left:17px; top:5px; text-align:center;font-size:12px; color:#ffffff !important;padding-bottom: 3px;padding-left: 1px;padding-right: 1px;} .navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;} .portraitRadius {border-radius: 3px;} .homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block; line-height:0;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 144b8526c..fe8acc564 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -448,7 +448,7 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no- #navSearchAlert {display:none;} .navHomepageNews {width:30px; display:block; float:right; margin-top:8px; position:relative;} .homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px no-repeat; width:30px; height:35px; display:block;} -.newsActive {width:8px; height:8px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;} +.newsActive {width:16px; height:16px; border-radius:50%; background-color:#ff0000; position:absolute; left:17px; top:5px; text-align:center;font-size:12px; color:#ffffff !important;padding-bottom: 3px;padding-left: 1px;padding-right: 1px;} .navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;} .homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block;} .homepageProfileMenuIcon:hover {background:url(../images/nav_icon.png) 30px -122px no-repeat;}