Commit 6cf189f0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'improve-avatar-header' into 'master'

Improve header with avatar for group and user pages

Nice looking and aligned headers for user and group pages

See merge request !412
parents 222e53a0 beece83a
...@@ -355,3 +355,22 @@ table { ...@@ -355,3 +355,22 @@ table {
bottom: 20px !important; bottom: 20px !important;
left: 20px !important; left: 20px !important;
} }
.header-with-avatar {
h3 {
margin: 0;
font-weight: bold;
}
.username {
font-size: 18px;
color: #666;
margin-top: 8px;
}
.description {
font-size: 16px;
color: #666;
margin-top: 8px;
}
}
...@@ -41,11 +41,6 @@ ...@@ -41,11 +41,6 @@
} }
} }
.user-show-username {
font-weight: 200;
color: #666;
}
/* /*
* Appearance settings * Appearance settings
* *
......
.dashboard .dashboard
%div .header-with-avatar.clearfix
= image_tag group_icon(@group), class: "avatar group-avatar s90" = image_tag group_icon(@group), class: "avatar group-avatar s90"
.clearfix %h3
%h2
= @group.name = @group.name
.username
@#{@group.path}
- if @group.description.present? - if @group.description.present?
%p .description
= escaped_autolink(@group.description) = escaped_autolink(@group.description)
%hr %hr
.row .row
......
...@@ -25,7 +25,3 @@ ...@@ -25,7 +25,3 @@
%li %li
%span.light Location: %span.light Location:
%strong= user.location %strong= user.location
- unless user.bio.blank?
%li
%span.light Bio:
%span= user.bio
...@@ -2,21 +2,25 @@ ...@@ -2,21 +2,25 @@
= link_to '#aside', class: 'show-aside' do = link_to '#aside', class: 'show-aside' do
%i.fa.fa-angle-left %i.fa.fa-angle-left
%section.col-md-8 %section.col-md-8
%h3.page-title .header-with-avatar
= image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: '' = image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: ''
%h3
= @user.name = @user.name
- if @user == current_user - if @user == current_user
.pull-right .pull-right
= link_to profile_path, class: 'btn' do = link_to profile_path, class: 'btn btn-sm' do
%i.fa.fa-pencil-square-o %i.fa.fa-pencil-square-o
Edit Profile settings Edit Profile settings
%br .username
%span.user-show-username #{@user.username} @#{@user.username}
%br .description
%small member since #{@user.created_at.stamp("Nov 12, 2031")} - if @user.bio.present?
= @user.bio
.clearfix .clearfix
- if @groups.any? - if @groups.any?
.prepend-top-20
%h4 Groups %h4 Groups
= render 'groups', groups: @groups = render 'groups', groups: @groups
%hr %hr
......
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