qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

This commit is contained in:
baiyu 2013-09-02 21:06:26 +08:00
parent 5dd8ca1f37 17ece286ed
commit a7983fec8f
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/users_controller.rb
View File

@ -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

15
public/stylesheets/application.css
View File

@ -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;}

1
public/themes/redpenny-master/stylesheets/application.css
View File

@ -1218,6 +1218,7 @@ p.stats {
height: 20px;
width: 908px;
margin-bottom: 5px;
padding-top: 10px;
}
.main-language {