github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-04 01:53:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: don't clip staff shield in user cards (#7398)

Browse Source
This commit is contained in:
Joe 2019-04-19 01:53:23 -07:00 committed by GitHub
parent 7e3628d11f
commit b150a57383
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
View File

@ -18,36 +18,35 @@
{{plugin-outlet name="user-card-avatar-flair" args=(hash user=user) tagName='div'}}
</div>
<div class="names">
<span>
<h1 class="{{staff}} {{newUser}} {{if nameFirst "full-name" "username"}}">
{{#if user.profile_hidden}}
<span>
{{if nameFirst user.name (format-username username)}}
{{user-status user currentUser=currentUser}}
</span>
{{else}}
<a href="{{user.path}}" {{action "showUser" user}} class='user-profile-link'>
{{if nameFirst user.name (format-username username)}}
{{user-status user currentUser=currentUser}}
</a>
{{/if}}
</h1>
{{plugin-outlet name="user-card-after-username" args=(hash user=user showUser=(action "showUser" user)) tagName=''}}
{{#unless nameFirst}}
{{#if user.name}}
<h2 class='full-name'>{{user.name}}</h2>
{{/if}}
<h1 class="{{staff}} {{newUser}} {{if nameFirst "full-name" "username"}}">
{{#if user.profile_hidden}}
<span class="name-username-wrapper">
{{if nameFirst user.name (format-username username)}}
</span>
{{else}}
<h2 class='username'>{{username}}</h2>
{{/unless}}
{{#if user.title}}
<h2>{{user.title}}</h2>
<a href="{{user.path}}" {{action "showUser" user}} class='user-profile-link'>
<span class="name-username-wrapper">
{{if nameFirst user.name (format-username username)}}
</span>
{{user-status user currentUser=currentUser}}
</a>
{{/if}}
{{#if user.staged}}
<h2 class="staged">{{i18n 'user.staged'}}</h2>
</h1>
{{plugin-outlet name="user-card-after-username" args=(hash user=user showUser=(action "showUser" user)) tagName=''}}
{{#unless nameFirst}}
{{#if user.name}}
<h2 class='full-name'>{{user.name}}</h2>
{{/if}}
{{plugin-outlet name="user-card-post-names" args=(hash user=user) tagName='div'}}
</span>
{{else}}
<h2 class='username'>{{username}}</h2>
{{/unless}}
{{#if user.title}}
<h2>{{user.title}}</h2>
{{/if}}
{{#if user.staged}}
<h2 class="staged">{{i18n 'user.staged'}}</h2>
{{/if}}
{{plugin-outlet name="user-card-post-names" args=(hash user=user) tagName='div'}}
</div>
<ul class="usercard-controls">
{{#if user.can_send_private_message_to_user}}
@ -221,4 +220,4 @@
{{/if}}
</div>
{{/if}}
{{/if}}

14
app/assets/stylesheets/common/components/user-card.scss
View File

@ -43,6 +43,20 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
.first-row {
.names {
padding-left: 1.25em;
.user-profile-link {
display: flex;
align-items: center;
}
.d-icon {
margin: 0 0.25em;
}
.name-username-wrapper {
margin-right: 0;
flex: 0 1 auto;
}
span {
display: block;
}