IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Malformed user card HTML

Browse Source
This commit is contained in:
Robin Ward 2014-11-04 13:13:45 -05:00
parent ac25a24b40
commit e96630c6f4
2 changed files with 61 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/templates/user-card.hbs
View File

@ -1,7 +1,6 @@
<div class="card-content"> <div class="card-content">
{{#if username}} {{#if username}}
{{#link-to 'user' user}}{{bound-avatar avatar "huge"}}{{/link-to}} {{#link-to 'user' user}}{{bound-avatar avatar "huge"}}{{/link-to}}
<div class="names"> <div class="names">
@ -25,7 +24,6 @@
</div> </div>
{{#if user}} {{#if user}}
<ul class="usercard-controls"> <ul class="usercard-controls">
{{#if user.can_send_private_message_to_user}} {{#if user.can_send_private_message_to_user}}
<li><a class='btn btn-primary' {{action "composePrivateMessage" user}}>{{fa-icon "envelope"}}{{i18n user.private_message}}</a></li> <li><a class='btn btn-primary' {{action "composePrivateMessage" user}}>{{fa-icon "envelope"}}{{i18n user.private_message}}</a></li>
@ -78,9 +76,7 @@
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}
</div>
{{else}}
<p class='loading'>{{i18n loading}}</p>
{{/if}} {{/if}}
{{/if}} {{/if}}
</div>

5
app/assets/stylesheets/desktop/user-card.scss
View File

@ -143,11 +143,6 @@
margin: 0 0 5px 0; margin: 0 0 5px 0;
} }
p.loading {
margin-top: 45px;
color: $primary;
}
.btn { .btn {
margin: 0 0 7px 0; margin: 0 0 7px 0;
box-sizing: border-box; box-sizing: border-box;