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

Don't overlap post date with a quote inside an embedded post. CSS could still be improved.

This commit is contained in:
Neil Lalonde 2013-07-03 15:11:28 -04:00
parent ba0bd934ba
commit 115491a057
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,11 +7,12 @@
</div> </div>
<h5 {{bindAttr class="staff new_user"}}><a href='{{unbound usernameUrl}}'>{{breakUp username}}</a></h5> <h5 {{bindAttr class="staff new_user"}}><a href='{{unbound usernameUrl}}'>{{breakUp username}}</a></h5>
</div> </div>
</div> </div>
<div class='span11 topic-body'> <div class='span11 topic-body'>
{{#if view.previousPost}}<a href='{{unbound url}}' class="arrow" title="{{i18n topic.jump_reply_up}}"><i class='icon icon-arrow-up'></i></a>{{/if}} <div class="topic-meta-data-inside">
<div class='post-date'>{{date created_at}}</div> <div class='post-info post-date'>{{date created_at}}</div>
{{#if view.previousPost}}<a href='{{unbound url}}' class="post-info arrow" title="{{i18n topic.jump_reply_up}}"><i class='icon icon-arrow-up'></i></a>{{/if}}
</div>
{{{unbound cooked}}} {{{unbound cooked}}}
{{#unless view.previousPost}}<a href='{{unbound url}}' class="arrow" title="{{i18n topic.jump_reply_down}}"><i class='icon icon-arrow-down'></i></a>{{/unless}} {{#unless view.previousPost}}<a href='{{unbound url}}' class="arrow" title="{{i18n topic.jump_reply_down}}"><i class='icon icon-arrow-down'></i></a>{{/unless}}
</div> </div>

53
app/assets/stylesheets/application/topic-post.css.scss
View File

@ -378,6 +378,24 @@
} }
} }
} }
.topic-meta-data-inside {
float: right;
z-index: 490;
margin-left: 20px;
.post-info {
font-size: 12px;
display: inline-block;
margin-right: 12px;
&.edits {
a, a:visited {
color: #aaa;
}
}
}
.post-date {
color: #aaa;
}
}
.reply-to-tab { .reply-to-tab {
z-index: 490; z-index: 490;
font-size: 12px; font-size: 12px;
@ -404,6 +422,10 @@
border-bottom: 1px solid #b9b9b9; border-bottom: 1px solid #b9b9b9;
display: none; display: none;
overflow: hidden; overflow: hidden;
.arrow {
float: right;
margin: 3px 0 3px 0;
}
} }
.embedded-posts.top { .embedded-posts.top {
@include border-radius-top(4px); @include border-radius-top(4px);
@ -414,6 +436,10 @@
.embedded-posts { .embedded-posts {
background-color: #e9e6e6; background-color: #e9e6e6;
.topic-meta-data-inside {
margin: 3px -8px 3px 20px;
}
div.reply { div.reply {
border-left: 1px solid #b9b9b9; border-left: 1px solid #b9b9b9;
border-right: 1px solid #b9b9b9; border-right: 1px solid #b9b9b9;
@ -451,18 +477,9 @@
left: -9px; left: -9px;
} }
a.arrow, .post-date {
float: right;
}
a.arrow { a.arrow {
margin: 3px 0 3px 0;
color: grey; color: grey;
} }
.post-date {
margin: 3px 10px 3px 0;
color: #aaa;
font-size: 12px;
}
} }
.about { .about {
.contents { .contents {
@ -508,24 +525,6 @@
z-index: 490; z-index: 490;
} }
.topic-meta-data-inside {
float: right;
z-index: 490;
margin-left: 20px;
.post-info {
font-size: 12px;
display: inline-block;
margin-right: 12px;
&.edits {
a, a:visited {
color: #aaa;
}
}
}
.post-date {
color: #aaa;
}
}
img { img {
max-width: 100%; max-width: 100%;
} }