codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-03-24 05:42:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

f**ing bootstrap, span14 = post-column

Browse source
This commit is contained in:
Jeff Atwood 2014-06-05 00:34:57 -07:00
parent e7991cb803
commit 80a862c358
5 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,7 +36,7 @@
{{/if}} {{/if}}
</div> </div>
<div class='topic-body span14'> <div class='topic-body post-column'>
<div class='topic-meta-data'> <div class='topic-meta-data'>
{{poster-name post=this expandAction="showPosterExpansion"}} {{poster-name post=this expandAction="showPosterExpansion"}}
<div class='post-info'> <div class='post-info'>

2
app/assets/javascripts/discourse/views/reply_history.js
View file

@ -8,7 +8,7 @@
**/ **/
Discourse.ReplyHistory = Em.CollectionView.extend({ Discourse.ReplyHistory = Em.CollectionView.extend({
tagName: 'section', tagName: 'section',
classNameBindings: [':embedded-posts', ':top', ':span14', ':offset2', 'hidden'], classNameBindings: [':embedded-posts', ':top', ':post-column', ':offset2', 'hidden'],
itemViewClass: Discourse.EmbeddedPostView, itemViewClass: Discourse.EmbeddedPostView,
hidden: Em.computed.equal('content.length', 0), hidden: Em.computed.equal('content.length', 0),
previousPost: true previousPost: true

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

@ -565,10 +565,6 @@ body {
margin-left: 12px; margin-left: 12px;
float: left; float: left;
} }
.span14 {
width: 716px;
float: left;
}
.span13 { .span13 {
width: 664px; width: 664px;
float: left; float: left;

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

@ -268,7 +268,7 @@ nav.post-controls {
max-width: 720px; max-width: 720px;
} }
} }
&.top.span14 {padding-left: 0;} &.top.post-column {padding-left: 0;}
.topic-body, .topic-avatar {border: none;} .topic-body, .topic-avatar {border: none;}
.topic-avatar {padding-left: 15px;} .topic-avatar {padding-left: 15px;}
.post-date {color: scale-color($primary, $lightness: 50%);} .post-date {color: scale-color($primary, $lightness: 50%);}
@ -737,7 +737,7 @@ blockquote { /* solo quotes */
float: left; float: left;
margin-top: 15px; margin-top: 15px;
ul {margin: 0;} ul {margin: 0;}
padding-left: 10px; padding-left: 8px;
i {font-size: 12px;} i {font-size: 12px;}
@ -792,10 +792,11 @@ blockquote { /* solo quotes */
//columns //columns
.span14 { .post-column {
width: 68%; width: 695px;
padding-left: 1%; float: left;
padding-right: 1%; padding-left: 10px;
padding-right: 10px;
} }
.span2 { width: 5%; } .span2 { width: 5%; }
@ -811,14 +812,10 @@ blockquote { /* solo quotes */
} }
@media screen and (max-width: 966px) { @media screen and (max-width: 955px) {
.gutter {display: none;} .span5 {
.span14 { width: 16%;
width: 78%; } // tighten right gutter
padding-left: 1%;
padding-right: 1%;
max-width: 720px;
} //main content
} }
.row:before, .row:after { .row:before, .row:after {

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

@ -43,9 +43,6 @@ img {
.span15 { .span15 {
width: 768px; width: 768px;
} }
.span14 {
width: 716px;
}
.span13 { .span13 {
width: 664px; width: 664px;
} }