From a318266c60b40c2933587fc04b48a246f8bffa8a Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Mon, 2 Sep 2013 20:37:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8tabs=E6=98=BE=E7=A4=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 3 ++- public/stylesheets/application.css | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a216033a9..93d4f3dda 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -207,9 +207,10 @@ class UsersController < ApplicationController end @users = scope.includes(:user_status).reorder('user_statuses.watchers_count').offset(@offset).limit(limit).all.reverse end + @s_type = 2 #@users = @users[@offset, @limit] end - @s_type = 2 + else @offset ||= @user_pages.reverse_offset unless @offset == 0 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index e3ed4bfb1..f545b8484 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -179,9 +179,20 @@ ul.tool li{list-style-type:none; .font_welcome_tdescription{ font-family: '微软雅黑'; font-size: 20px; - color: #5c5c5c; + color: #5c5c5c; + text-align: justify; + text-justify: inter-ideograph; } +.font_welcome_tdescription2{ + font-family: Arial, Helvetica, sans-serif; + font-size: 20px; + color: #FF0000; + text-align: justify; + text-justify: inter-ideograph; +} + + .font_welcome_Edescription{ font-family: Default; font-size: 16px; @@ -1149,7 +1160,7 @@ ul.projects li {list-style-type:none; #projects-index ul.projects ul.projects { border-left: 3px solid #e0e0e0; padding-left:1em;} #projects-index ul.projects li.root {margin-bottom: 1em;} #projects-index ul.projects li.child {margin-top: 1em;} -#projects-index ul.projects div.root a.project {font-family:'微软雅黑', "Trebuchet MS", Verdana, sans-serif; font-weight: bold; font-size: 16px; margin: 0 0 10px 0; } +#projects-index ul.projects div.root a.project {font-family:'微软雅黑', "Trebuchet MS", Verdana, sans-serif; font-weight: bold; font-size: 14px; margin: 0 0 10px 0; } .my-project { padding-left: 18px; background: url(../images/fav.png) no-repeat 0 50%; } #notified-projects ul, #tracker_project_ids ul {max-height:250px; overflow-y:auto;} From 17ece286ede517ff6ee1a3f4ff74ca5921de258c Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Mon, 2 Sep 2013 20:44:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/themes/redpenny-master/stylesheets/application.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index b7393c56c..87da45832 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -1218,6 +1218,7 @@ p.stats { height: 20px; width: 908px; margin-bottom: 5px; + padding-top: 10px; } .main-language {