From 37aba522cfe5260f0b38c9c28aaf411150de3f0f Mon Sep 17 00:00:00 2001 From: Will Bradley Date: Thu, 29 Aug 2013 01:42:26 -0700 Subject: [PATCH] Profile tweaks --- app/assets/stylesheets/users.css.scss | 4 ++++ app/views/users/show.html.erb | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss index d372b96..170c27d 100644 --- a/app/assets/stylesheets/users.css.scss +++ b/app/assets/stylesheets/users.css.scss @@ -10,4 +10,8 @@ .avatar { height: 2em; width: 2em; } +.avatar-large { +vertical-align: top; +} + textarea { height: 10em; } diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 9cde252..bd47b8e 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,14 +1,13 @@ -

<%= @user.name %>

- -<%= image_tag @user.gravatar_url(:default => "http://members.heatsynclabs.org/assets/nil.png") %> - -

+

+ <%= image_tag @user.gravatar_url(:default => "http://members.heatsynclabs.org/assets/nil.png"), :class => 'avatar-large' %> + <%= @user.name %> <%= raw(@user.member_status_symbol) %> <%= link_to image_tag('/twitter.png', :class => 'social-icon', :title => "Twitter"), @user.twitter_url, :class => 'social-link' if @user.twitter_url.present? %> <%= link_to image_tag('/facebook.png', :class => 'social-icon', :title => "Facebook"), @user.facebook_url, :class => 'social-link' if @user.facebook_url.present? %> <%= link_to image_tag('/github.png', :class => 'social-icon', :title => "Github"), @user.github_url, :class => 'social-link' if @user.github_url.present? %> <%= link_to image_tag('/website.png', :class => 'social-icon', :title => "Website"), @user.website_url, :class => 'social-link' if @user.website_url.present? %> -

+

+ <% if current_user.admin? || @user.email_visible %>