Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FEATURE: show avatar flair on user profile page

This commit is contained in:
Neil Lalonde 2018-02-13 17:13:32 -05:00
parent 556ab8480e
commit 22f0b0096d
4 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/discourse/templates/user.hbs
View File

@ -39,7 +39,16 @@
<div class='profile-image'></div> <div class='profile-image'></div>
<div class='details'> <div class='details'>
<div class='primary'> <div class='primary'>
{{bound-avatar model "huge"}} <div class='user-profile-avatar'>
{{bound-avatar model "huge"}}
{{#if model.primary_group_name}}
{{avatar-flair
flairURL=model.primary_group_flair_url
flairBgColor=model.primary_group_flair_bg_color
flairColor=model.primary_group_flair_color
groupName=model.primary_group_name}}
{{/if}}
</div>
<section class='controls'> <section class='controls'>
<ul> <ul>
{{#if model.can_send_private_message_to_user}} {{#if model.can_send_private_message_to_user}}

6
app/assets/stylesheets/common/base/topic-post.scss
View File

@ -263,7 +263,7 @@ aside.quote {
} }
.topic-avatar, .avatar-flair-preview, .user-card-avatar, .topic-map .poster { .topic-avatar, .avatar-flair-preview, .user-card-avatar, .topic-map .poster, .user-profile-avatar {
.avatar-flair { .avatar-flair {
display: flex; display: flex;
align-items: center; align-items: center;
@ -275,7 +275,7 @@ aside.quote {
right: -6px; right: -6px;
} }
} }
.topic-avatar .avatar-flair, .avatar-flair-preview .avatar-flair { .topic-avatar .avatar-flair, .avatar-flair-preview .avatar-flair, .collapsed-info .user-profile-avatar .avatar-flair {
background-size: 20px 20px; background-size: 20px 20px;
width: 20px; width: 20px;
height: 20px; height: 20px;
@ -288,7 +288,7 @@ aside.quote {
right: -8px; right: -8px;
} }
} }
.user-card-avatar .avatar-flair { .user-card-avatar .avatar-flair, .user-profile-avatar .avatar-flair {
background-size: 40px 40px; background-size: 40px 40px;
width: 40px; width: 40px;
height: 40px; height: 40px;

16
app/assets/stylesheets/common/base/user.scss
View File

@ -120,6 +120,15 @@
} }
} }
} }
.user-profile-avatar {
position: relative;
float: left;
.avatar-flair {
bottom: 8px;
right: 16px;
}
}
} }
.controls { .controls {
@ -176,6 +185,13 @@
} }
} }
} }
.user-profile-avatar {
.avatar-flair {
bottom: 8px;
right: 2px;
}
}
} }
} }

7
app/assets/stylesheets/mobile/user.scss
View File

@ -127,6 +127,10 @@
max-width: 700px; max-width: 700px;
} }
} }
.user-profile-avatar .avatar-flair {
right: 2px;
}
} }
.controls { .controls {
@ -177,6 +181,9 @@
} }
} }
} }
.user-profile-avatar .avatar-flair {
bottom: 12px;
}
} }
} }