Commit beece83a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Improve header with avatar for group and user pages

parent f0d052b6
...@@ -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
- if @group.description.present? @#{@group.path}
%p - if @group.description.present?
= escaped_autolink(@group.description) .description
= escaped_autolink(@group.description)
%hr %hr
.row .row
%section.activities.col-md-8 %section.activities.col-md-8
......
...@@ -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,24 +2,28 @@ ...@@ -2,24 +2,28 @@
= 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: ''
= @user.name %h3
- if @user == current_user = @user.name
.pull-right - if @user == current_user
= link_to profile_path, class: 'btn' do .pull-right
%i.fa.fa-pencil-square-o = link_to profile_path, class: 'btn btn-sm' do
Edit Profile settings %i.fa.fa-pencil-square-o
%br Edit Profile settings
%span.user-show-username #{@user.username} .username
%br @#{@user.username}
%small member since #{@user.created_at.stamp("Nov 12, 2031")} .description
- if @user.bio.present?
= @user.bio
.clearfix .clearfix
- if @groups.any? - if @groups.any?
%h4 Groups .prepend-top-20
= render 'groups', groups: @groups %h4 Groups
%hr = render 'groups', groups: @groups
%hr
.hidden-xs .hidden-xs
.user-calendar .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