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

Merge branch 'master' into deprecation

This commit is contained in:
Jason W. May 2014-10-31 10:44:51 -07:00
parent bdc7947cd6 22525ff74c
commit ce511231a4
4 changed files with 36 additions and 14 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;}
} }
} }

1
discourse.sublime-project
View File

@ -12,6 +12,7 @@
"file_exclude_patterns": ["*.sqlite3"] "file_exclude_patterns": ["*.sqlite3"]
}, },
{ "path": "lib" }, { "path": "lib" },
{ "path": "plugins" },
{ "path": "script" }, { "path": "script" },
{ "path": "spec" }, { "path": "spec" },
{ "path": "test", { "path": "test",

11
plugins/poll/assets/javascripts/initializers/poll.js.es6
View File

@ -9,9 +9,12 @@ var Poll = Discourse.Model.extend({
this.updateFromJson(this.get('post.poll_details')); this.updateFromJson(this.get('post.poll_details'));
}.observes('post.poll_details'), }.observes('post.poll_details'),
fetchNewPostDetails: function() { fetchNewPostDetails: Discourse.debounce(function() {
this.get('post.topic.postStream').triggerChangedPost(this.get('post.id'), this.get('post.topic.updated_at')); var self = this;
}.observes('post.topic.title'), Discourse.debounce(function() {
self.get('post.topic.postStream').triggerChangedPost(self.get('post.id'), self.get('post.topic.updated_at'));
}, 500);
}).observes('post.topic.title'),
updateFromJson: function(json) { updateFromJson: function(json) {
var selectedOption = json["selected"]; var selectedOption = json["selected"];
@ -24,8 +27,8 @@ var Poll = Discourse.Model.extend({
checked: (option === selectedOption) checked: (option === selectedOption)
})); }));
}); });
this.set('options', options);
this.set('options', options);
this.set('closed', json.closed); this.set('closed', json.closed);
}, },