Commit fae8468d authored by tauriedavis's avatar tauriedavis

shrink profile info

parent 9498c4d5
...@@ -144,12 +144,9 @@ ...@@ -144,12 +144,9 @@
.cover-title { .cover-title {
color: $gl-header-color; color: $gl-header-color;
margin: 0; margin: 0;
font-size: 24px;
font-weight: normal; font-weight: normal;
margin-bottom: 10px; margin-bottom: 10px;
color: #4c4e54;
font-size: 23px; font-size: 23px;
line-height: 1.1;
h1 { h1 {
color: $gl-gray-dark; color: $gl-gray-dark;
...@@ -213,6 +210,9 @@ ...@@ -213,6 +210,9 @@
} }
} }
} }
&.user-cover-block {
padding: 24px 0 0;
}
.group-info { .group-info {
......
...@@ -204,7 +204,7 @@ body { ...@@ -204,7 +204,7 @@ body {
} }
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
color: $gl-header-color; color: $gl-title-color;
font-weight: 600; font-weight: 600;
} }
......
...@@ -102,7 +102,7 @@ $gl-grayish-blue: #7f8fa4; ...@@ -102,7 +102,7 @@ $gl-grayish-blue: #7f8fa4;
$gl-gray: $gl-text-color; $gl-gray: $gl-text-color;
$gl-gray-dark: #313236; $gl-gray-dark: #313236;
$gl-gray-light: $gl-placeholder-color; $gl-gray-light: $gl-placeholder-color;
$gl-header-color: $gl-title-color; $gl-header-color: #4c4e54;
/* /*
* Lists * Lists
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
= auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity") = auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity")
.user-profile .user-profile
.cover-block .cover-block.user-cover-block
.cover-controls .cover-controls
- if @user == current_user - if @user == current_user
= link_to profile_path, class: 'btn btn-gray' do = link_to profile_path, class: 'btn btn-gray' do
...@@ -38,44 +38,46 @@ ...@@ -38,44 +38,46 @@
.avatar-holder .avatar-holder
= link_to avatar_icon(@user, 400), target: '_blank' do = link_to avatar_icon(@user, 400), target: '_blank' do
= image_tag avatar_icon(@user, 90), class: "avatar s90", alt: '' = image_tag avatar_icon(@user, 90), class: "avatar s90", alt: ''
.cover-title
= @user.name .user-info
.cover-title
= @user.name
%span
@#{@user.username}
.cover-desc .cover-desc
%span.middle-dot-divider %span.middle-dot-divider
@#{@user.username} Member since #{@user.created_at.to_s(:medium)}
%span.middle-dot-divider
Member since #{@user.created_at.to_s(:medium)} .cover-desc
- unless @user.public_email.blank?
.profile-link-holder.middle-dot-divider
= link_to @user.public_email, "mailto:#{@user.public_email}"
- unless @user.skype.blank?
.profile-link-holder.middle-dot-divider
= link_to "skype:#{@user.skype}", title: "Skype" do
= icon('skype')
- unless @user.linkedin.blank?
.profile-link-holder.middle-dot-divider
= link_to "https://www.linkedin.com/in/#{@user.linkedin}", title: "LinkedIn" do
= icon('linkedin-square')
- unless @user.twitter.blank?
.profile-link-holder.middle-dot-divider
= link_to "https://twitter.com/#{@user.twitter}", title: "Twitter" do
= icon('twitter-square')
- unless @user.website_url.blank?
.profile-link-holder.middle-dot-divider
= link_to @user.short_website_url, @user.full_website_url
- unless @user.location.blank?
.profile-link-holder.middle-dot-divider
= icon('map-marker')
= @user.location
- if @user.bio.present? - if @user.bio.present?
.cover-desc .cover-desc
%p.profile-user-bio %p.profile-user-bio
= @user.bio = @user.bio
.cover-desc
- unless @user.public_email.blank?
.profile-link-holder.middle-dot-divider
= link_to @user.public_email, "mailto:#{@user.public_email}"
- unless @user.skype.blank?
.profile-link-holder.middle-dot-divider
= link_to "skype:#{@user.skype}", title: "Skype" do
= icon('skype')
- unless @user.linkedin.blank?
.profile-link-holder.middle-dot-divider
= link_to "https://www.linkedin.com/in/#{@user.linkedin}", title: "LinkedIn" do
= icon('linkedin-square')
- unless @user.twitter.blank?
.profile-link-holder.middle-dot-divider
= link_to "https://twitter.com/#{@user.twitter}", title: "Twitter" do
= icon('twitter-square')
- unless @user.website_url.blank?
.profile-link-holder.middle-dot-divider
= link_to @user.short_website_url, @user.full_website_url
- unless @user.location.blank?
.profile-link-holder.middle-dot-divider
= icon('map-marker')
= @user.location
%ul.nav-links.center.user-profile-nav %ul.nav-links.center.user-profile-nav
%li.js-activity-tab %li.js-activity-tab
= link_to user_calendar_activities_path, data: {target: 'div#activity', action: 'activity', toggle: 'tab'} do = link_to user_calendar_activities_path, data: {target: 'div#activity', action: 'activity', toggle: 'tab'} do
......
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