diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index e61cbbba9..2f29210f7 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -88,12 +88,14 @@
<% for user in @users -%>
+ <%= 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"%> <%= 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 "div", content_tag("p", user.firstname), :class => "clear avatar_name" %> -

+ <%= content_tag "span", link_to_user(user), :class => "nomargin avatar_name" %> + <%= content_tag "span", content_tag("p", user.firstname), :class => "clear avatar_name" %> +

<% unless user.memberships.empty? %> <%= l(:label_contribute_to, :project_count => "#{user.memberships.count}") %> <% for member in user.memberships %> @@ -101,7 +103,7 @@ <% end %> <% end %> <%= user.changesets.count == 0 ? '' : ",#{l(:label_total_commit, :total_commit => user.changesets.count)}" %> -

+
<% end -%>
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index 3a51450eb..a5bcab085 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -980,7 +980,7 @@ ol li ol li ol li #login-form #username,#login-form #password { - width:275px!important; + width:265px!important; font-size:14px; padding:3px; margin-bottom:10px @@ -1268,7 +1268,7 @@ div.project-block img.avatar2 { color: black; min-height: 20px; height: auto; - padding: 10px 19px 6px 19px; + padding: 10px 19px 16px 19px; margin-bottom: 0px; /*background-color: #f5f5f5;*/ border-bottom: 1px solid #eee;