mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-27 17:46:05 -05:00
f**ing bootstrap, span14 = post-column
This commit is contained in:
parent
e7991cb803
commit
80a862c358
5 changed files with 13 additions and 23 deletions
|
@ -36,7 +36,7 @@
|
|||
{{/if}}
|
||||
</div>
|
||||
|
||||
<div class='topic-body span14'>
|
||||
<div class='topic-body post-column'>
|
||||
<div class='topic-meta-data'>
|
||||
{{poster-name post=this expandAction="showPosterExpansion"}}
|
||||
<div class='post-info'>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
**/
|
||||
Discourse.ReplyHistory = Em.CollectionView.extend({
|
||||
tagName: 'section',
|
||||
classNameBindings: [':embedded-posts', ':top', ':span14', ':offset2', 'hidden'],
|
||||
classNameBindings: [':embedded-posts', ':top', ':post-column', ':offset2', 'hidden'],
|
||||
itemViewClass: Discourse.EmbeddedPostView,
|
||||
hidden: Em.computed.equal('content.length', 0),
|
||||
previousPost: true
|
||||
|
|
|
@ -565,10 +565,6 @@ body {
|
|||
margin-left: 12px;
|
||||
float: left;
|
||||
}
|
||||
.span14 {
|
||||
width: 716px;
|
||||
float: left;
|
||||
}
|
||||
.span13 {
|
||||
width: 664px;
|
||||
float: left;
|
||||
|
|
|
@ -268,7 +268,7 @@ nav.post-controls {
|
|||
max-width: 720px;
|
||||
}
|
||||
}
|
||||
&.top.span14 {padding-left: 0;}
|
||||
&.top.post-column {padding-left: 0;}
|
||||
.topic-body, .topic-avatar {border: none;}
|
||||
.topic-avatar {padding-left: 15px;}
|
||||
.post-date {color: scale-color($primary, $lightness: 50%);}
|
||||
|
@ -737,7 +737,7 @@ blockquote { /* solo quotes */
|
|||
float: left;
|
||||
margin-top: 15px;
|
||||
ul {margin: 0;}
|
||||
padding-left: 10px;
|
||||
padding-left: 8px;
|
||||
|
||||
i {font-size: 12px;}
|
||||
|
||||
|
@ -792,10 +792,11 @@ blockquote { /* solo quotes */
|
|||
|
||||
//columns
|
||||
|
||||
.span14 {
|
||||
width: 68%;
|
||||
padding-left: 1%;
|
||||
padding-right: 1%;
|
||||
.post-column {
|
||||
width: 695px;
|
||||
float: left;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
}
|
||||
|
||||
.span2 { width: 5%; }
|
||||
|
@ -811,14 +812,10 @@ blockquote { /* solo quotes */
|
|||
}
|
||||
|
||||
|
||||
@media screen and (max-width: 966px) {
|
||||
.gutter {display: none;}
|
||||
.span14 {
|
||||
width: 78%;
|
||||
padding-left: 1%;
|
||||
padding-right: 1%;
|
||||
max-width: 720px;
|
||||
} //main content
|
||||
@media screen and (max-width: 955px) {
|
||||
.span5 {
|
||||
width: 16%;
|
||||
} // tighten right gutter
|
||||
}
|
||||
|
||||
.row:before, .row:after {
|
||||
|
|
3
app/assets/stylesheets/vendor/bootstrap.scss
vendored
3
app/assets/stylesheets/vendor/bootstrap.scss
vendored
|
@ -43,9 +43,6 @@ img {
|
|||
.span15 {
|
||||
width: 768px;
|
||||
}
|
||||
.span14 {
|
||||
width: 716px;
|
||||
}
|
||||
.span13 {
|
||||
width: 664px;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue