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, span11 = .embedded-posts body

This commit is contained in:
Jeff Atwood 2014-06-05 02:29:56 -07:00
parent 972d58b876
commit f245da5142
4 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class='span11 topic-body'> <div class='topic-body'>
<div class="topic-meta-data"> <div class="topic-meta-data">
<h5 {{bind-attr class="staff new_user"}}><a href='{{unbound usernameUrl}}'>{{{breakUp username name}}}</a></h5> <h5 {{bind-attr class="staff new_user"}}><a href='{{unbound usernameUrl}}'>{{{breakUp username name}}}</a></h5>
{{#if view.parentView.previousPost}}<a href='{{unbound url}}' class="post-info arrow" title="{{i18n topic.jump_reply_up}}"><i class='fa fa-arrow-up'></i></a>{{/if}} {{#if view.parentView.previousPost}}<a href='{{unbound url}}' class="post-info arrow" title="{{i18n topic.jump_reply_up}}"><i class='fa fa-arrow-up'></i></a>{{/if}}

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

@ -569,10 +569,6 @@ body {
width: 664px; width: 664px;
float: left; float: left;
} }
.span11 {
width: 560px;
float: left;
}
.span10 { .span10 {
width: 508px; width: 508px;
float: left; float: left;

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

@ -249,40 +249,43 @@ nav.post-controls {
.embedded-posts { .embedded-posts {
h1, h2, h3 {margin: 10px 0;} h1, h2, h3 {margin: 10px 0;}
a.mention {background: darken(scale-color-diff(), 10%);} a.mention {background: darken(scale-color-diff(), 10%);}
.topic-body { width: 610px; border: none; }
// bottom means "reply expansion" below a post
&.bottom { &.bottom {
&.hidden {display: block; opacity: 0; } &.hidden {display: block; opacity: 0; }
} }
&.bottom .arrow {float: right; margin: 0 0 0 0;} &.bottom .arrow {float: right; margin: 0 0 0 0;}
&.top { &.bottom { margin-top: -11px;}
// top means "in reply to expansion" above a post
&.top {
margin-left: 66px; margin-left: 66px;
max-width: 713px; max-width: 713px;
@include medium-width { @include medium-width {
margin-left: 59px; margin-left: 59px;
} }
@include small-width { @include small-width {
margin-left: 57px; margin-left: 57px;
max-width: 720px; max-width: 720px;
} }
} }
&.top.topic-body {padding-left: 0;} &.top.topic-body {padding-left: 0;}
.topic-body, .topic-avatar {border: none;} .topic-avatar {border: none; padding-left: 15px;}
.topic-avatar {padding-left: 15px;}
.post-date {color: scale-color($primary, $lightness: 50%);} .post-date {color: scale-color($primary, $lightness: 50%);}
.fa-arrow-up {margin-left: 5px;} .fa-arrow-up {margin-left: 5px;}
.row {border-top: 1px solid darken(scale-color-diff(), 10%); padding-top: 7px;} .row {border-top: 1px solid darken(scale-color-diff(), 10%); padding-top: 7px;}
.reply:first-of-type .row {border-top: none;} .reply:first-of-type .row {border-top: none;}
.quote {margin-top: 0 !important;} .quote {margin-top: 0 !important;}
background: scale-color-diff(); background: scale-color-diff();
.quote .title, blockquote, .onebox, .onebox-result { .quote .title, blockquote, .onebox, .onebox-result {
background: darken(scale-color-diff(), 5%); background: darken(scale-color-diff(), 5%);
border-left: 5px solid darken(scale-color-diff(), 12%); border-left: 5px solid darken(scale-color-diff(), 12%);
} }
&.bottom { margin-top: -11px;}
.topic-meta-data { .topic-meta-data {
position: relative; position: relative;
} }
@ -795,11 +798,6 @@ blockquote { /* solo quotes */
//columns //columns
.span11 {
width: 84%;
padding-left: 4%;
}
.span5 { .span5 {
width: 19%; width: 19%;
padding-left: 1%; padding-left: 1%;

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

@ -46,9 +46,6 @@ img {
.span13 { .span13 {
width: 664px; width: 664px;
} }
.span11 {
width: 560px;
}
.span10 { .span10 {
width: 508px; width: 508px;
} }