diff --git a/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars b/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars index 7d9c6a8e572..1d86535d58c 100644 --- a/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars +++ b/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars @@ -7,11 +7,12 @@
{{breakUp username}}
-
- {{#if view.previousPost}}{{/if}} -
{{date created_at}}
+
+ + {{#if view.previousPost}}{{/if}} +
{{{unbound cooked}}} {{#unless view.previousPost}}{{/unless}}
diff --git a/app/assets/stylesheets/application/topic-post.css.scss b/app/assets/stylesheets/application/topic-post.css.scss index 41aa7c4a0d2..3bf8db7fdba 100644 --- a/app/assets/stylesheets/application/topic-post.css.scss +++ b/app/assets/stylesheets/application/topic-post.css.scss @@ -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 { z-index: 490; font-size: 12px; @@ -404,6 +422,10 @@ border-bottom: 1px solid #b9b9b9; display: none; overflow: hidden; + .arrow { + float: right; + margin: 3px 0 3px 0; + } } .embedded-posts.top { @include border-radius-top(4px); @@ -414,6 +436,10 @@ .embedded-posts { background-color: #e9e6e6; + .topic-meta-data-inside { + margin: 3px -8px 3px 20px; + } + div.reply { border-left: 1px solid #b9b9b9; border-right: 1px solid #b9b9b9; @@ -451,18 +477,9 @@ left: -9px; } - a.arrow, .post-date { - float: right; - } a.arrow { - margin: 3px 0 3px 0; color: grey; } - .post-date { - margin: 3px 10px 3px 0; - color: #aaa; - font-size: 12px; - } } .about { .contents { @@ -508,24 +525,6 @@ 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 { max-width: 100%; }