From ec97ecdcf6c2d0c03e40ce247fe93156dcdfef2e Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Sat, 10 Aug 2013 19:58:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=95=8C=E9=9D=A2=E6=96=87?= =?UTF-8?q?=E5=AD=97=E6=8F=8F=E8=BF=B0=E3=80=81=E7=95=8C=E9=9D=A2=E9=A3=8E?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/index.html.erb | 88 ++++++++++++++++++++++++++++-- public/stylesheets/application.css | 40 ++++++++++++-- 2 files changed, 119 insertions(+), 9 deletions(-) diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index d5cb677e2..dac149745 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -66,16 +66,96 @@ - --> - -
+
+ +
+
+ + + +
Trustieforge是一个社交化的项目管理、软件开发和众包平台。
Trustieforge is a socialized collaboration platform for project management, + software development and software crowdsourcing.
+
+ +
+
<%= call_hook :view_account_login_top %>
<%= form_tag(signin_path) do %> <%= back_url_hidden_field_tag %> - <% unless User.current.logged? %> + <% unless User.current.logged? %> + + + + + + + + + + <% if Setting.openid? %> + + + + + <% end %> + + + + + + + + +
<%= text_field_tag 'username', params[:username], :tabindex => '1' %>
<%= password_field_tag 'password', nil, :tabindex => '2' %>
<%= text_field_tag "openid_url", nil, :tabindex => '3' %>
+ <% if Setting.autologin? %> + + <% end %> +
+ <% if Setting.lost_password? %> + <%= link_to l(:label_password_lost), lost_password_path %> + <% end %> + + +
+ <% end %> +<% end %> +
+<%= call_hook :view_account_login_bottom %> + +<% if params[:username].present? %> +<%= javascript_tag "$('#password').focus();" %> +<% else %> +<%= javascript_tag "$('#username').focus();" %> +<% end %> + +
+ +--> + + + + + +
+
+ + + +
Trustieforge 是一个社交化的项目管理、软件开发和众包平台。
Trustieforge is a socialized collaboration platform for project management, + software development and software crowdsourcing.
+
+ + + +
+ <%= call_hook :view_account_login_top %> +
+ <%= form_tag(signin_path) do %> + <%= back_url_hidden_field_tag %> + <% unless User.current.logged? %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 1ecc265a9..4815c16ec 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -106,12 +106,26 @@ ul.tool li{list-style-type:none; font-size: 16px; color:#6d6e6e; } -.font_welcome2{ - font-family:微软雅黑; - font-weight: bold; + +.font_welcome_trustie{ + font-family:Impact; + font-weight: regular; + font-size: 24px; + color:#15bccf; +} + +.font_welcome_Cdescription{ + font-family: 微软雅黑; + font-size: 18px; + color: #5c5c5c; +} + +.font_welcome_Edescription{ + font-family: Default; font-size: 16px; - color:#6d6e6e; + color: #9a9a9a; } + .font_welcome_feature{ font-family:微软雅黑; font-weight: bold; @@ -131,6 +145,7 @@ ul.tool li{list-style-type:none; color:#acaeb1; font-size:12px; } + .font_lighter_welcome{ color:#acaeb1; font-size:12px; @@ -161,7 +176,22 @@ ul.tool li{list-style-type:none; } .spaceleft{float: left; width: 240px;} + .spaceright{float:left; width:620px;} + +.welcone_left{ + margin-top: 70px; + margin-left: 90px; + float:left; + width: 49%; +} + +.welcome_right{ + margin-right:200px; + float:right; + width: 49%; +} + .inf_user_motto{ padding-left:8px; margin:5px 0px 0px 0px; @@ -869,7 +899,7 @@ margin-left:-10px; -webkit-box-shadow:0 0 6px #039ea0; box-shadow:0 0 6px #039ea0; border:1px solid #AAA; - margin-left: 600px; + margin-left:20px; } /*end*/ .splitcontentright{float:right; width:49%;}