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

f**ing bootstrap, span2 = topic-avatar

This commit is contained in:
Jeff Atwood 2014-06-05 01:42:27 -07:00
parent 48f58eff1d
commit 3ed8b8f155
6 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/templates/modal/admin_suspend_user.js.handlebars
View File

@ -1,7 +1,7 @@
<div class="modal-body"> <div class="modal-body">
<form> <form>
{{i18n admin.user.suspend_duration}} {{i18n admin.user.suspend_duration}}
{{textField value=duration maxlength="5" autofocus="autofocus" class="span2"}} {{textField value=duration maxlength="5" autofocus="autofocus"}}
{{i18n admin.user.suspend_duration_units}}<br/> {{i18n admin.user.suspend_duration_units}}<br/>
<br/> <br/>
{{{i18n admin.user.suspend_reason_label}}}<br/> {{{i18n admin.user.suspend_reason_label}}}<br/>

2
app/assets/javascripts/discourse/templates/embedded_post.js.handlebars
View File

@ -1,5 +1,5 @@
<div class='row'> <div class='row'>
<div class='topic-avatar span2'> <div class='topic-avatar'>
<div class='contents'> <div class='contents'>
<div> <div>
<a href='/users/{{unbound username}}'>{{avatar this imageSize="large"}}</a> <a href='/users/{{unbound username}}'>{{avatar this imageSize="large"}}</a>

2
app/assets/javascripts/discourse/templates/post.js.handlebars
View File

@ -17,7 +17,7 @@
{{/if}} {{/if}}
</a> </a>
{{/if}} {{/if}}
<div class='topic-avatar span2'> <div class='topic-avatar'>
{{#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 class="main-avatar" href='{{unbound usernameUrl}}' {{action showPosterExpansion this}}>{{avatar this imageSize="large"}}</a> <a class="main-avatar" href='{{unbound usernameUrl}}' {{action showPosterExpansion this}}>{{avatar this imageSize="large"}}</a>

8
app/assets/stylesheets/desktop/discourse.scss
View File

@ -594,14 +594,6 @@ body {
margin-right: 12px; margin-right: 12px;
float: left; float: left;
} }
.span3 {
width: 144px;
float: left;
}
.span2 {
width: 92px;
float: left;
}
.offset2 { .offset2 {
margin-left: 116px; margin-left: 116px;
} }

14
app/assets/stylesheets/desktop/topic-post.scss
View File

@ -778,12 +778,14 @@ blockquote { /* solo quotes */
.topic-avatar { .topic-avatar {
border-top: 1px solid scale-color-diff(); border-top: 1px solid scale-color-diff();
padding-top: 16px; padding-top: 16px;
width: 55px;
float: left;
.wiki { .wiki {
margin-top: 14px; margin-top: 14px;
color: scale-color($primary, $lightness: 60%); color: scale-color($primary, $lightness: 60%);
margin-left: 5px; margin-left: 5px;
} }
} }
.posts-wrapper { .posts-wrapper {
@ -799,8 +801,6 @@ blockquote { /* solo quotes */
padding-right: 10px; padding-right: 10px;
} }
.span2 { width: 5%; }
.span11 { .span11 {
width: 84%; width: 84%;
padding-left: 4%; padding-left: 4%;

6
app/assets/stylesheets/vendor/bootstrap.scss vendored
View File

@ -64,12 +64,6 @@ img {
.span4 { .span4 {
width: 196px; width: 196px;
} }
.span3 {
width: 144px;
}
.span2 {
width: 92px;
}
.offset2 { .offset2 {
margin-left: 116px; margin-left: 116px;
} }