Commit 6cf189f0 authored by Dmytro Zaporozhets's avatar Dmytro 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 {
bottom: 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 @@
}
}
.user-show-username {
font-weight: 200;
color: #666;
}
/*
* Appearance settings
*
......
.dashboard
%div
.header-with-avatar.clearfix
= image_tag group_icon(@group), class: "avatar group-avatar s90"
.clearfix
%h2
= @group.name
- if @group.description.present?
%p
= escaped_autolink(@group.description)
%h3
= @group.name
.username
@#{@group.path}
- if @group.description.present?
.description
= escaped_autolink(@group.description)
%hr
.row
%section.activities.col-md-8
......
......@@ -25,7 +25,3 @@
%li
%span.light Location:
%strong= user.location
- unless user.bio.blank?
%li
%span.light Bio:
%span= user.bio
......@@ -2,24 +2,28 @@
= link_to '#aside', class: 'show-aside' do
%i.fa.fa-angle-left
%section.col-md-8
%h3.page-title
.header-with-avatar
= image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: ''
= @user.name
- if @user == current_user
.pull-right
= link_to profile_path, class: 'btn' do
%i.fa.fa-pencil-square-o
Edit Profile settings
%br
%span.user-show-username #{@user.username}
%br
%small member since #{@user.created_at.stamp("Nov 12, 2031")}
%h3
= @user.name
- if @user == current_user
.pull-right
= link_to profile_path, class: 'btn btn-sm' do
%i.fa.fa-pencil-square-o
Edit Profile settings
.username
@#{@user.username}
.description
- if @user.bio.present?
= @user.bio
.clearfix
- if @groups.any?
%h4 Groups
= render 'groups', groups: @groups
%hr
.prepend-top-20
%h4 Groups
= render 'groups', groups: @groups
%hr
.hidden-xs
.user-calendar
......
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