Commit 99c37390 authored by tauriedavis's avatar tauriedavis

clean up profile

parent fae8468d
...@@ -129,8 +129,6 @@ ...@@ -129,8 +129,6 @@
position: relative; position: relative;
.avatar-holder { .avatar-holder {
margin-bottom: 16px;
.avatar, .identicon { .avatar, .identicon {
margin: 0 auto; margin: 0 auto;
float: none; float: none;
...@@ -143,9 +141,6 @@ ...@@ -143,9 +141,6 @@
.cover-title { .cover-title {
color: $gl-header-color; color: $gl-header-color;
margin: 0;
font-weight: normal;
margin-bottom: 10px;
font-size: 23px; font-size: 23px;
h1 { h1 {
......
...@@ -93,8 +93,9 @@ ...@@ -93,8 +93,9 @@
.profile-user-bio { .profile-user-bio {
// Limits the width of the user bio for readability. // Limits the width of the user bio for readability.
max-width: 750px; max-width: 600px;
margin: auto; margin: 15px auto 0;
padding: 0 16px;
} }
.user-avatar-button { .user-avatar-button {
...@@ -212,6 +213,28 @@ ...@@ -212,6 +213,28 @@
} }
.user-profile { .user-profile {
.cover-controls a {
margin-left: 5px;
}
.profile-header {
margin: 0 auto;
.avatar-holder {
width: 90px;
display: inline-block;
}
.user-info {
display: inline-block;
text-align: left;
vertical-align: middle;
margin-left: 15px;
.handle {
color: $gl-gray-light;
}
.member-date {
margin-bottom: 4px;
}
}
}
@media (max-width: $screen-xs-max) { @media (max-width: $screen-xs-max) {
.cover-block { .cover-block {
padding-top: 20px; padding-top: 20px;
...@@ -219,16 +242,26 @@ ...@@ -219,16 +242,26 @@
.cover-controls { .cover-controls {
position: static; position: static;
padding: 0 16px;
margin-bottom: 20px; margin-bottom: 20px;
display: -webkit-flex;
display: flex;
.btn { .btn {
display: inline-block; -webkit-flex-grow: 1;
width: 46%; flex-grow: 1;
&:first-child {
margin-left: 0;
}
} }
} }
} }
} }
.user-profile-nav {
margin-top: 15px;
}
table.u2f-registrations { table.u2f-registrations {
th:not(:last-child), td:not(:last-child) { th:not(:last-child), td:not(:last-child) {
border-right: solid 1px transparent; border-right: solid 1px transparent;
......
...@@ -16,62 +16,60 @@ ...@@ -16,62 +16,60 @@
= link_to profile_path, class: 'btn btn-gray' do = link_to profile_path, class: 'btn btn-gray' do
= icon('pencil') = icon('pencil')
- elsif current_user - elsif current_user
%span.report-abuse - if @user.abuse_report
- if @user.abuse_report %button.btn.btn-danger{ title: 'Already reported for abuse',
%button.btn.btn-danger{ title: 'Already reported for abuse', data: { toggle: 'tooltip', placement: 'bottom', container: 'body' }}
data: { toggle: 'tooltip', placement: 'left', container: 'body' }} = icon('exclamation-circle')
= icon('exclamation-circle') - else
- else = link_to new_abuse_report_path(user_id: @user.id, ref_url: request.referrer), class: 'btn btn-gray',
= link_to new_abuse_report_path(user_id: @user.id, ref_url: request.referrer), class: 'btn btn-gray', title: 'Report abuse', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
title: 'Report abuse', data: {toggle: 'tooltip', placement: 'left', container: 'body'} do = icon('exclamation-circle')
= icon('exclamation-circle')
- if current_user - if current_user
 
= link_to user_path(@user, :atom, { private_token: current_user.private_token }), class: 'btn btn-gray' do = link_to user_path(@user, :atom, { private_token: current_user.private_token }), class: 'btn btn-gray' do
= icon('rss') = icon('rss')
- if current_user.admin? - if current_user.admin?
 
= link_to [:admin, @user], class: 'btn btn-gray', title: 'View user in admin area', = link_to [:admin, @user], class: 'btn btn-gray', title: 'View user in admin area',
data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= icon('users') = icon('users')
.avatar-holder .profile-header
= link_to avatar_icon(@user, 400), target: '_blank' do .avatar-holder
= image_tag avatar_icon(@user, 90), class: "avatar s90", alt: '' = link_to avatar_icon(@user, 400), target: '_blank' do
= image_tag avatar_icon(@user, 90), class: "avatar s90", alt: ''
.user-info .user-info
.cover-title .cover-title
= @user.name = @user.name
%span %span.handle
@#{@user.username} @#{@user.username}
.cover-desc .cover-desc.member-date
%span.middle-dot-divider %span.middle-dot-divider
Member since #{@user.created_at.to_s(:medium)} Member since #{@user.created_at.to_s(:medium)}
.cover-desc .cover-desc
- unless @user.public_email.blank? - unless @user.public_email.blank?
.profile-link-holder.middle-dot-divider .profile-link-holder.middle-dot-divider
= link_to @user.public_email, "mailto:#{@user.public_email}" = link_to @user.public_email, "mailto:#{@user.public_email}"
- unless @user.skype.blank? - unless @user.skype.blank?
.profile-link-holder.middle-dot-divider .profile-link-holder.middle-dot-divider
= link_to "skype:#{@user.skype}", title: "Skype" do = link_to "skype:#{@user.skype}", title: "Skype" do
= icon('skype') = icon('skype')
- unless @user.linkedin.blank? - unless @user.linkedin.blank?
.profile-link-holder.middle-dot-divider .profile-link-holder.middle-dot-divider
= link_to "https://www.linkedin.com/in/#{@user.linkedin}", title: "LinkedIn" do = link_to "https://www.linkedin.com/in/#{@user.linkedin}", title: "LinkedIn" do
= icon('linkedin-square') = icon('linkedin-square')
- unless @user.twitter.blank? - unless @user.twitter.blank?
.profile-link-holder.middle-dot-divider .profile-link-holder.middle-dot-divider
= link_to "https://twitter.com/#{@user.twitter}", title: "Twitter" do = link_to "https://twitter.com/#{@user.twitter}", title: "Twitter" do
= icon('twitter-square') = icon('twitter-square')
- unless @user.website_url.blank? - unless @user.website_url.blank?
.profile-link-holder.middle-dot-divider .profile-link-holder.middle-dot-divider
= link_to @user.short_website_url, @user.full_website_url = link_to @user.short_website_url, @user.full_website_url
- unless @user.location.blank? - unless @user.location.blank?
.profile-link-holder.middle-dot-divider .profile-link-holder.middle-dot-divider
= icon('map-marker') = icon('map-marker')
= @user.location = @user.location
- if @user.bio.present? - if @user.bio.present?
.cover-desc .cover-desc
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment