+
\ No newline at end of file
diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb
index 16bf7c271..6a221f5b6 100644
--- a/app/views/layouts/_base_header.html.erb
+++ b/app/views/layouts/_base_header.html.erb
@@ -1,4 +1,4 @@
-
@@ -95,21 +95,21 @@
+ | 
<%= link_to l(:project_module_documents),project_documents_path(@project) %> |
-
+ |
<%= link_to l(:project_module_wiki),project_wiki_path(@project) %> |
|
+ |
<%= link_to l(:project_module_calendar),project_calendar_path(@project) %>
|
-
+ |
<%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %>
|
|
+ |
<%= link_to l(:project_module_boards) ,project_boards_path(@project) %>
|
- <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @user,:show_flag => false,:user_id => User.current.id}%>
+
- <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @user,:show_flag => false,:user_id => User.current.id}%>
- <%= l(:label_user_watcher) %> (<%= User.watched_by(@user.id).count %>)
- <%= l(:label_user_fans) %> (<%= @user.watcher_users.count %>)
+
@@ -60,13 +60,13 @@
+ <%= l(:label_user_watcher) %> (<%= link_to User.watched_by(@user.id).count, :controller=>"users",:action=>"user_watchlist" %>)
+ <%= l(:label_user_fans) %> (<%= link_to @user.watcher_users.count,:controller=>"users",:action=>"user_fanslist" %>)
| <%= l(:label_user_joinin) %> | <%= format_date(@user.created_on) %> | +<%= l(:label_user_joinin) %> | <%= format_date(@user.created_on) %> |
| <%= l(:label_user_login) %> | <%= format_date(@user.last_login_on) %> | +<%= l(:label_user_login) %> | <%= format_date(@user.last_login_on) %> |
| <%= l(:label_user_mail) %> | <%= mail_to(h(@user.mail), nil, :encode => 'javascript') %> | +<%= l(:label_user_mail) %> | <%= mail_to(h(@user.mail), nil, :encode => 'javascript') %> |
- <%= l(:label_user_watcher) %>(<%= link_to User.watched_by(@user.id).count, :controller=>"users",:action=>"user_watchlist" %>)
+ <%= l(:label_user_watcher) %>
@@ -93,7 +93,7 @@
diff --git a/public/images/sidebar/male.png b/public/images/sidebar/male.png
index 4be03451f..f432062af 100644
Binary files a/public/images/sidebar/male.png and b/public/images/sidebar/male.png differ
diff --git a/public/images/welcome/1.png b/public/images/welcome/1.png
index 44b9bc435..bff3a17c8 100644
Binary files a/public/images/welcome/1.png and b/public/images/welcome/1.png differ
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 3b980fff9..ca1064e76 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -11,6 +11,16 @@ h4 {border-bottom: 1px dotted #bbb;}
/*new by huang*/
/**/
+.footer_color{
+ background-image: -moz-linear-gradient(top,#BBBBBB,#FFFFEC);
+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#ffffff),to(#15bccf));
+ background-image: -webkit-linear-gradient(top,#ffffff,#15bccf);
+ background-image: -o-linear-gradient(top,#ffffff,#15bccf);
+ background-image: linear-gradient(to bottom,#ffffff,#15bccf);
+ background-repeat: repeat-x;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff111111',GradientType=0)
+}
+
ul.list_watch{list-style-type:none;
height:auto;
border-bottom: 1px dashed rgb(204, 204, 204);
@@ -26,9 +36,9 @@ ul.tool{margin:0px; padding-left:0em;}
ul.tool li{list-style-type:none;
height:auto;}
.font_index{
- font-size:24px;
+ font-size:22px;
font-family: 微软雅黑;
- color:#03a7dd;
+ color:#068d9c;
}
.font_content{
font-size:14px;
@@ -78,16 +88,16 @@ ul.tool li{list-style-type:none;
.font_title_left{
font-family:微软雅黑;
font-weight:bold;
- padding-left: 12px;
+ padding-left: 10px;
padding-top:3px;
padding-bottom:3px;
font-size:16px;
- /*color:#00aaf8;*/
+ /*color:#05a8bb;*/
}
.font_small_watch{
font-family:微软雅黑;
font-weight:bold;
- color:#00aaf8;
+ color:#15bccf;
}
.left_wf{
padding-left:8px;
@@ -95,6 +105,11 @@ ul.tool li{list-style-type:none;
.main_context{
padding-bottom: 5px;
}
+.welcome_image{
+ height: 27px;
+ width: 30px;
+
+}
.font_welcome{
font-family:微软雅黑;
font-weight: bold;
@@ -230,7 +245,7 @@ ul.tool li{list-style-type:none;
padding:1;
width:240px;
height:1px;
- background-color:#03a7dd;
+ background-color:#15bccf;
overflow:hidden
}
.user_underline2{
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index d4f6ec1a8..4c8c5ec1d 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -364,8 +364,10 @@ ul.projects li.root
#top-menu
{
- background-color:#000; /*顶层导航颜色*/
- font-size:12px;
+ background-color:#fff; /*顶层导航颜色*/
+ color: #fff;
+ font-size:13px;
+ font-family: 微软雅黑;
position:relative;
padding:0;
height:1px;
@@ -380,15 +382,15 @@ ul.projects li.root
#top-menu li,#top-menu #loggedas
{
/*by young*/
- color:#AAAAAA;
+ color:#fff;
line-height:21px;
margin-right:4px
}
#top-menu li a
{
- /*Modified by young*/
- color:#00AAF8;
+ /*by young*/
+ color:#fff;
font-weight:6px;
padding:4px 5px
}
@@ -473,7 +475,7 @@ ul.projects li.root
#footer
{
- background-color:#EEE; /*低端背景*/
+ background-color:#fff; /*footer bg add by huang*/
border:0;
clear:left;
color:#666;
- <%= l(:label_user_fans) %>(<%= link_to @user.watcher_users.count,:controller=>"users",:action=>"user_fanslist" %>)
+ <%= l(:label_user_fans) %>