diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index d5194e5d4..661ec0c58 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -2,9 +2,7 @@
- - - +
<%= l(:label_welcome_trustie) %> , <%= l(:label_welcome_trustie_description) %>
<%= l(:label_welcome_trustie) %> , <%= l(:label_welcome_trustie_description) %>
@@ -49,14 +47,14 @@
<% else %>
- + - + @@ -176,8 +174,6 @@
<%= l(:label_welcome) %> <%=link_to User.current.lastname< <%= l(:label_join) %>
<%= image_tag(url_to_avatar(User.current), :class => 'avatar') %><%= image_tag(url_to_avatar(User.current), :class => 'avatar') %> <%= link_to l(:label_user_watcher)+"("+User.watched_by(User.current).count.to_s+")", user_path(User.current) %>  <%=link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+User.current.watcher_users(User.current.id).count.to_s+")", user_path(User.current) %>
-
- diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 86d54da96..6895e08b5 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -12,6 +12,42 @@ h4 {border-bottom: 1px dotted #bbb;} /*new by huang*/ /**/ /*new code reconstruction*/ +/*div.forums-welcome{ + width: 30%; +} + +.forums-welcome-title{ + font-weight: bold; + margin-bottom:10px; + border-bottom: solid 1px rgb(204, 204, 204); +} + +span.forums-welcome-massage{ + display: block; + height: 30px; + border: 1px solid #15bccf; + border-bottom: 1px solid #15bccf; + border-right: 1px solid #15bccf; + background: white; + position: relative; + float: left; + width: 80%; +} + +span.forums-welcome-massage-right{ + display: block; + height: 30px; + border: 1px solid #15bccf; + border-bottom: 1px solid #15bccf; + border-right: 1px solid #15bccf; + background: white; + position: relative; + float: right; + width: 18.5%; + background-color: #15bccf; + height: 30px; +}*/ + div.sidebar-forums{ padding-left: 8px; width: 214px; @@ -418,7 +454,7 @@ ul.tool li{list-style-type:none; .font_welcome_trustie{ font-family:Impact; font-weight: regular; - font-size: 29px; + font-size: 24px; color:#15bccf; } @@ -430,7 +466,7 @@ ul.tool li{list-style-type:none; .font_welcome_tdescription{ font-family: '微软雅黑'; - font-size: 20px; + font-size: 16px; color: #5c5c5c; text-align: justify; text-justify: inter-ideograph; @@ -542,9 +578,8 @@ ul.tool li{list-style-type:none; .spaceright{float:left; width:620px;} .welcone_left{ - margin-top: 60px; - - margin-left: 90px; + margin-top: 70px; + margin-left: 80px; float:left; width: 49%; }