From 23fc4b8589ddc3d6e0b38b8a9a4bac2b641e3fee Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Sun, 4 Aug 2013 10:56:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E7=94=A8=E6=88=B7=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_users.html.erb | 6 ++-- app/views/welcome/index.html.erb | 47 ++++++++++++++++++-------- public/images/welcome/boards.png | Bin 0 -> 3330 bytes public/images/welcome/discuss.png | Bin 0 -> 3403 bytes public/images/welcome/news.png | Bin 0 -> 3405 bytes public/stylesheets/application.css | 45 +++++++++++++++++++----- 6 files changed, 73 insertions(+), 25 deletions(-) create mode 100644 public/images/welcome/boards.png create mode 100644 public/images/welcome/discuss.png create mode 100644 public/images/welcome/news.png diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index ab8cae4e4..6fc361533 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 cd9459ee2..79d7988d4 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 0000000000000000000000000000000000000000..bf575421c31d6bd1b55f7328eb1f70bfbb438203 GIT binary patch literal 3330 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 literal 0 HcmV?d00001 diff --git a/public/images/welcome/news.png b/public/images/welcome/news.png new file mode 100644 index 0000000000000000000000000000000000000000..a22985f93557d68382bf30e86c988ed9e5531486 GIT binary patch literal 3405 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 literal 0 HcmV?d00001 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index c16485a5b..f28a18bab 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;