p94386572
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

解决登陆框忘记密码折行问题

This commit is contained in:
nieguanghui 2013-08-09 15:02:53 +08:00
parent b8a3d3f673
commit 3e9175e689
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/users/index.html.erb
View File

@ -88,12 +88,14 @@
<div class="autoscroll"> <div class="autoscroll">
<% for user in @users -%> <% for user in @users -%>
<div class="well"> <div class="well">
<%= content_tag "p", "#{format_date(user.created_on)}#{l(:label_member_since)}", :class => "float_right member_since" %> <%= content_tag "p", "#{format_date(user.created_on)}#{l(:label_member_since)}", :class => "float_right member_since" %>
<%= image_tag "/images/time_member.png", :class => "img_member_time"%>
<!-- <%= get_avatar?(user) ? (link_to image_tag(avatar_image(user), :class => 'avatar'), user_path(user), :class => "avatar") : (link_to image_tag("/images/12_50.png", :class => 'avatar'), user_path(user), :class => "avatar") %> --> <!-- <%= get_avatar?(user) ? (link_to image_tag(avatar_image(user), :class => 'avatar'), user_path(user), :class => "avatar") : (link_to image_tag("/images/12_50.png", :class => 'avatar'), user_path(user), :class => "avatar") %> -->
<%= link_to image_tag(url_to_avatar(user), :class => 'avatar'), user_path(user) %> <%= link_to image_tag(url_to_avatar(user), :class => 'avatar'), user_path(user) %>
<%= content_tag "div", link_to_user(user), :class => "nomargin avatar_name" %> <%= content_tag "span", link_to_user(user), :class => "nomargin avatar_name" %>
<%= content_tag "div", content_tag("p", user.firstname), :class => "clear avatar_name" %> <%= content_tag "span", content_tag("p", user.firstname), :class => "clear avatar_name" %>
<p> <div class="user-bottom">
<% unless user.memberships.empty? %> <% unless user.memberships.empty? %>
<%= l(:label_contribute_to, :project_count => "#{user.memberships.count}") %> <%= l(:label_contribute_to, :project_count => "#{user.memberships.count}") %>
<% for member in user.memberships %> <% for member in user.memberships %>
@ -101,7 +103,7 @@
<% end %> <% end %>
<% end %> <% end %>
<%= user.changesets.count == 0 ? '' : ",#{l(:label_total_commit, :total_commit => user.changesets.count)}" %> <%= user.changesets.count == 0 ? '' : ",#{l(:label_total_commit, :total_commit => user.changesets.count)}" %>
</p> </div>
</div> </div>
<% end -%> <% end -%>
</div> </div>

4
public/themes/redpenny-master/stylesheets/application.css
View File

@ -980,7 +980,7 @@ ol li ol li ol li
#login-form #username,#login-form #password #login-form #username,#login-form #password
{ {
width:275px!important; width:265px!important;
font-size:14px; font-size:14px;
padding:3px; padding:3px;
margin-bottom:10px margin-bottom:10px
@ -1268,7 +1268,7 @@ div.project-block img.avatar2 {
color: black; color: black;
min-height: 20px; min-height: 20px;
height: auto; height: auto;
padding: 10px 19px 6px 19px; padding: 10px 19px 16px 19px;
margin-bottom: 0px; margin-bottom: 0px;
/*background-color: #f5f5f5;*/ /*background-color: #f5f5f5;*/
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;