jacknudt
/
socialforge
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:
yanxd 2013-11-05 16:53:49 +08:00
parent b7027405ce f15619d99d
commit 6246b45fe2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/locales/zh.yml
View File

@ -520,6 +520,7 @@ zh:
lable_contest_user: 竞赛发布人： #huang lable_contest_user: 竞赛发布人： #huang
label_user_home: 创客空间 label_user_home: 创客空间
label_user_location: 当前位置 label_user_location: 当前位置
label_course_term: 开课学期
label_theme: 主题 label_theme: 主题
label_logged_as_new: 当前用户 label_logged_as_new: 当前用户
button_register: 注册 button_register: 注册

4
public/stylesheets/application.css
View File

@ -13,9 +13,9 @@ h4 {border-bottom: 1px dotted #bbb;}
/**/ /**/
.top-content{ .top-content{
background-color: #f7f7f7; background-color: #f7f7f7;
height: 45px; height: 50px;
width: 940px; width: 940px;
line-height: 1em; line-height: 1.2em;
padding-top: 5px; padding-top: 5px;
margin-bottom: 10px; margin-bottom: 10px;
} }