codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 15:48:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2934 from awesomerobot/master

Browse source 
some small usercard fixes, more to come!
This commit is contained in:
Sam 2014-10-31 16:29:10 +11:00
commit 11eff54ead
2 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/assets/javascripts/discourse/templates/user-card.hbs
View file

@ -1,6 +1,6 @@
{{#if username}} <div class="card-content">
<div class="card-content"> {{#if username}}
{{#link-to 'user' user}}{{bound-avatar avatar "huge"}}{{/link-to}} {{#link-to 'user' user}}{{bound-avatar avatar "huge"}}{{/link-to}}
@ -9,9 +9,19 @@
<h1 {{bind-attr class="staff new_user"}}> <h1 {{bind-attr class="staff new_user"}}>
{{#link-to 'user' user}}{{username}}{{/link-to}} {{#link-to 'user' user}}{{username}}{{/link-to}}
</h1> </h1>
{{#if user.title}}
<h2>{{user.title}}</h2> {{#if user.name}}
<h2>{{user.name}}</h2>
{{/if}} {{/if}}
{{#if user.title}}
{{#if user.name}}
<h2>/ {{user.title}}</h2>
{{else}}
<h2> {{user.title}}</h2>
{{/if}}
{{/if}}
{{#if showName}} {{#if showName}}
<h2>{{#link-to 'user' user}}{{name}}{{/link-to}}</h2> <h2>{{#link-to 'user' user}}{{name}}{{/link-to}}</h2>
{{/if}} {{/if}}

20
app/assets/stylesheets/desktop/user-card.scss
View file

@ -11,11 +11,13 @@
color: $secondary; color: $secondary;
background-size: cover; background-size: cover;
background-position: center center; background-position: center center;
min-height: 175px;
.card-content { .card-content {
padding: 12px; padding: 12px;
background: rgba($primary, .85); background: rgba($primary, .85);
margin-top: 100px; margin-top: 85px;
&:after { &:after {
content: ''; content: '';
display: block; display: block;
@ -24,6 +26,8 @@
} }
&.no-bg { &.no-bg {
min-height: 50px;
.card-content { .card-content {
margin-top: 0; margin-top: 0;
} }
@ -60,6 +64,7 @@
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: inline;
a { a {
color: $secondary; color: $secondary;
} }
@ -101,8 +106,8 @@
} }
.bio { .bio {
max-height: 55px; max-height: 60px;
overflow: auto; overflow: hidden;
float: left; float: left;
margin: 10px 0; margin: 10px 0;
width: 70%; width: 70%;
@ -161,6 +166,7 @@
position: absolute; position: absolute;
bottom: 0; bottom: 0;
display: block; display: block;
width: 250px;
} }
} }
@ -186,7 +192,6 @@
.more-user-badges { .more-user-badges {
@extend .user-badge; @extend .user-badge;
padding: 3px 8px; padding: 3px 8px;
font-size: 13px;
} }
} }
@ -199,7 +204,10 @@
img { img {
max-width: 100px; max-width: 100px;
} }
float: right; position: absolute;
margin-right: 5px; right: 12px;
bottom: 12px;
font-size: 30px;
i {color: $secondary;}
} }
} }