Merge branch 'shrink-profile-info' into 'master'

app/assets/stylesheets/framework/blocks.scss

@@ -129,8 +129,6 @@
   position: relative;
 
   .avatar-holder {
-    margin-bottom: 16px;
-
     .avatar, .identicon {
       margin: 0 auto;
       float: none;
@@ -143,13 +141,7 @@
 
   .cover-title {
     color: $gl-header-color;
-    margin: 0;
-    font-size: 24px;
-    font-weight: normal;
-    margin-bottom: 10px;
-    color: #4c4e54;
     font-size: 23px;
-    line-height: 1.1;
 
     h1 {
       color: $gl-gray-dark;
@@ -213,6 +205,9 @@
       }
     }
   }
+  &.user-cover-block {
+    padding: 24px 0 0;
+  }
 
   .group-info {
 

app/assets/stylesheets/framework/typography.scss

@@ -204,7 +204,7 @@ body {
 }
 
 h1, h2, h3, h4, h5, h6 {
-  color: $gl-header-color;
+  color: $gl-title-color;
   font-weight: 600;
 }
 

app/assets/stylesheets/framework/variables.scss

@@ -102,7 +102,7 @@ $gl-grayish-blue:      #7f8fa4;
 $gl-gray:              $gl-text-color;
 $gl-gray-dark:         #313236;
 $gl-gray-light:        $gl-placeholder-color;
-$gl-header-color:      $gl-title-color;
+$gl-header-color:      #4c4e54;
 
 /*
  * Lists

app/assets/stylesheets/pages/profile.scss

@@ -93,8 +93,9 @@
 
 .profile-user-bio {
   // Limits the width of the user bio for readability.
-  max-width: 750px;
-  margin: auto;
+  max-width: 600px;
+  margin: 15px auto 0;
+  padding: 0 16px;
 }
 
 .user-avatar-button {
@@ -212,6 +213,28 @@
 }
 
 .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) {
     .cover-block {
       padding-top: 20px;
@@ -219,14 +242,24 @@
 
     .cover-controls {
       position: static;
+      padding: 0 16px;
       margin-bottom: 20px;
+      display: -webkit-flex;
+      display: flex;
 
       .btn {
-        display: inline-block;
-        width: 46%;
+        -webkit-flex-grow: 1;
+        flex-grow: 1;
+        &:first-child {
+          margin-left: 0;
         }
       }
     }
+  }
+}
+
+.user-profile-nav {
+  margin-top: 15px;
 }
 
 table.u2f-registrations {

app/views/users/show.html.haml

@@ -10,48 +10,43 @@
   = auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity")
 
 .user-profile
-  .cover-block
+  .cover-block.user-cover-block
     .cover-controls
       - if @user == current_user
         = link_to profile_path, class: 'btn btn-gray' do
           = icon('pencil')
       - elsif current_user
-        %span.report-abuse
         - if @user.abuse_report
           %button.btn.btn-danger{ title: 'Already reported for abuse',
-              data: { toggle: 'tooltip', placement: 'left', container: 'body' }}
+            data: { toggle: 'tooltip', placement: 'bottom', container: 'body' }}
             = icon('exclamation-circle')
         - else
           = 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: 'left', container: 'body'} do
+            title: 'Report abuse', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
             = icon('exclamation-circle')
       - if current_user
-         
         = link_to user_path(@user, :atom, { private_token: current_user.private_token }), class: 'btn btn-gray' do
           = icon('rss')
         - if current_user.admin?
-           
           = link_to [:admin, @user], class: 'btn btn-gray', title: 'View user in admin area',
             data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
             = icon('users')
 
+    .profile-header
       .avatar-holder
         = link_to avatar_icon(@user, 400), target: '_blank' do
           = image_tag avatar_icon(@user, 90), class: "avatar s90", alt: ''
+    
+      .user-info
         .cover-title
           = @user.name
-
-    .cover-desc
-      %span.middle-dot-divider
+          %span.handle
             @#{@user.username}
+
+        .cover-desc.member-date
           %span.middle-dot-divider
             Member since #{@user.created_at.to_s(:medium)}
 
-    - if @user.bio.present?
-      .cover-desc
-        %p.profile-user-bio
-          = @user.bio
-
         .cover-desc
           - unless @user.public_email.blank?
             .profile-link-holder.middle-dot-divider
@@ -76,6 +71,11 @@
               = icon('map-marker')
               = @user.location
 
+    - if @user.bio.present?
+      .cover-desc
+        %p.profile-user-bio
+          = @user.bio
+
     %ul.nav-links.center.user-profile-nav
       %li.js-activity-tab
         = link_to user_calendar_activities_path, data: {target: 'div#activity', action: 'activity', toggle: 'tab'} do