diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index ab8cae4e..6fc36153 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -33,12 +33,12 @@ - + + <% else %><%= link_to(l(:label_user_edit), edit_user_path(@user)) if User.current.admin? %><% end %>
<%= h @user.name%><%= h @user.name%>
<% unless User.current == @user %> <%= watcher_link(@user, User.current) %> - <% else %> <%= link_to(l(:label_user_edit), edit_user_path(@user)) if User.current.admin? %><% end %>
@@ -61,7 +61,7 @@ 邮件地址：<%= mail_to(h(@user.mail), nil, :encode => 'javascript') %> -
+
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index cd9459ee..79d7988d 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -119,25 +119,44 @@ <% end %> - - - +
+ +
+ + - -
-

<%=link_to "项目管理",:controller => 'projects', :action => 'new' %>

+
+

项目管理

+

添加描述添加描述添加描述添加描述...

 -

<%=link_to "项目需求",:controller => 'bids', :action => 'index' %>

+

项目需求

+

添加描述添加描述添加描述添加描述...

 -

<%=link_to "发现开源",:controller=>'projects',:action=>'index' %>

+

发现开源

+

添加描述添加描述添加描述添加描述...

- - - -
特性
-
-
+ +
+ +
+
特性 +
+
+
+ + + + + + + + +
讨论区
+
新闻
+
里程碑
+
互信、分享互信、分享互信、分享互信、分享互信、分享互信、分享互信、分享互信、分享...最新动态,最新动态,最新动态,最新动态,最新动态,最新动态,最新动态,最新动态,最新动态,...我们的历程,我们的历程,我们的历程,我们的历程,我们的历程,我们的历程,我们的历程,我们的历程,...
+
+
- diff --git a/public/images/welcome/boards.png b/public/images/welcome/boards.png new file mode 100644 index 00000000..bf575421 Binary files /dev/null and b/public/images/welcome/boards.png differ diff --git a/public/images/welcome/discuss.png b/public/images/welcome/discuss.png new file mode 100644 index 00000000..d27a6ecc Binary files /dev/null and b/public/images/welcome/discuss.png differ diff --git a/public/images/welcome/news.png b/public/images/welcome/news.png new file mode 100644 index 00000000..a22985f9 Binary files /dev/null and b/public/images/welcome/news.png differ diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index c16485a5..f28a18ba 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -82,6 +82,25 @@ ul.tool li{list-style-type:none; .main_context{ padding-bottom: 5px; } +.font_welcome{ + font-family:微软雅黑; + font-weight: bold; + font-size: 16px; + color:#6d6e6e; +} +.font_welcome2{ + font-family:微软雅黑; + font-weight: bold; + font-size: 16px; + color:#6d6e6e; +} +.font_welcome_feature{ + font-family:微软雅黑; + font-weight: bold; + font-size: 16px; + color:#09b2c8; + padding-top: 50px; +} .info_font{ font-family:微软雅黑; font-weight:bold; @@ -93,12 +112,16 @@ ul.tool li{list-style-type:none; color:#acaeb1; font-size:12px; } +.font_lighter_welcome{ + color:#acaeb1; + font-size:12px; + font-family:宋体; +} .font_lighter_sidebar{ font-family:微软雅黑; color:#919294; font-size:13px; - padding-left: 8px; - + padding-left: 8px; } .font_description{ font-size:14px; @@ -198,6 +221,15 @@ ul.tool li{list-style-type:none; background-color:#c6e9fe; overflow:hidden } +.user_underline3{ + margin:1; + padding:1; + width:120px; + height:1px; + background-color:#c6e9fe; + overflow:hidden; + margin-top: 10px; +} .line_under{ border-bottom: 1px dashed rgb(204, 204, 204); } @@ -794,17 +826,14 @@ margin-left:-10px; #header a {font-family: Verdana, sans-serif; font-size: 12px; color:#808080;} #login-form_new table { - padding:25px 28px; + padding:20px 25px; background:#fff; text-align:left; width:380px; - margin:10px auto; - margin-top:100px; - + margin-top: 50px; width:310px; - margin:10px auto; - + font-family:微软雅黑,lucida grande,verdana; font-size:12px; -webkit-border-radius:10px;