codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 09:36:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2232 from vikhyat/username-on-top-setting

Browse source 
Add option to show username on top of posts instead of the left gutter
This commit is contained in:
Sam 2014-04-11 10:13:18 +10:00
commit fe6153ba96
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/assets/javascripts/discourse/templates/post.js.handlebars
View file

@ -22,19 +22,21 @@
{{#unless userDeleted}} {{#unless userDeleted}}
<div {{bind-attr class=":contents byTopicCreator:topic-creator :trigger-expansion"}}> <div {{bind-attr class=":contents byTopicCreator:topic-creator :trigger-expansion"}}>
<a href='{{unbound usernameUrl}}' {{action showPosterExpansion this}}>{{avatar this imageSize="large"}}</a> <a href='{{unbound usernameUrl}}' {{action showPosterExpansion this}}>{{avatar this imageSize="large"}}</a>
<h3 {{bind-attr class="staff new_user"}}><a href='{{unbound usernameUrl}}' {{action showPosterExpansion this}}>{{{breakUp username name}}}</a></h3> <div class="names">
<h3 {{bind-attr class="staff new_user :username"}}><a href='{{unbound usernameUrl}}' {{action showPosterExpansion this}}>{{{breakUp username name}}}</a></h3>
{{#if showName}} {{#if showName}}
<h3 class="full-name"><a href='{{unbound usernameUrl}}' {{action showPosterExpansion this}}>{{breakUp name}}</a></h3> <h3 class="full-name"><a href='{{unbound usernameUrl}}' {{action showPosterExpansion this}}>{{breakUp name}}</a></h3>
{{/if}}
{{#if user_title}}
{{#if primary_group_name}}
<div class="user-title"><a href='/groups/{{unbound primary_group_name}}' class='user-group'>{{unbound user_title}}</a></div>
{{else}}
<div class="user-title" {{action showPosterExpansion this}}>{{unbound user_title}}</div>
{{/if}} {{/if}}
{{/if}}
{{#if user_title}}
{{#if primary_group_name}}
<div class="user-title"><a href='/groups/{{unbound primary_group_name}}' class='user-group'>{{unbound user_title}}</a></div>
{{else}}
<div class="user-title" {{action showPosterExpansion this}}>{{unbound user_title}}</div>
{{/if}}
{{/if}}
</div>
</div> </div>
{{else}} {{else}}
<div class="contents"> <div class="contents">

8
app/assets/stylesheets/desktop/topic-post.scss
View file

@ -62,10 +62,10 @@ h1 .topic-statuses .topic-status i {
background: $primary_background_color; background: $primary_background_color;
color: $secondary_text_color; color: $secondary_text_color;
@include medium-width { @include medium-width {
left: 107px; left: 107px;
} }
@include small-width { @include small-width {
left: 103px; left: 103px;
} }
} }
@ -805,6 +805,7 @@ blockquote { /* solo quotes */
.row:before, .row:after {display: table; content: "";} .row:before, .row:after {display: table; content: "";}
.row:after {clear: both;} .row:after {clear: both;}
.embedded-posts { .embedded-posts {
h1, h2, h3 {margin: 10px 0;} h1, h2, h3 {margin: 10px 0;}
a.mention {background: lighten($secondary_background_color, 70%);} a.mention {background: lighten($secondary_background_color, 70%);}
@ -1002,7 +1003,7 @@ blockquote { /* solo quotes */
} }
} }
} }
article.boxed { article.boxed {
position: relative; position: relative;
line-height: 21px; line-height: 21px;
@ -1019,7 +1020,6 @@ blockquote { /* solo quotes */
border-bottom: 1px solid $primary_border_color; border-bottom: 1px solid $primary_border_color;
border-right: 1px solid $primary_border_color; border-right: 1px solid $primary_border_color;
color: $secondary_text_color; color: $secondary_text_color;
} }
} }
} }