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

Merge pull request #2201 from vikhyat/fix-post-highlight 

Fix post highlighting
This commit is contained in:
Régis Hanol 2014-03-28 15:07:49 +01:00
parent 622448fc9c 49298ec327
commit 93b3cc1e15
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/views/post_view.js
View File

@ -209,7 +209,7 @@ Discourse.PostView = Discourse.GroupedView.extend(Ember.Evented, {
// If we're meant to highlight a post // If we're meant to highlight a post
if ((highlightNumber > 1) && (highlightNumber === postNumber)) { if ((highlightNumber > 1) && (highlightNumber === postNumber)) {
this.set('controller.highlightOnInsert', null); this.set('controller.highlightOnInsert', null);
var $contents = $('.topic-body .contents', $post), var $contents = $('.topic-body', $post),
origColor = $contents.data('orig-color') || $contents.css('backgroundColor'); origColor = $contents.data('orig-color') || $contents.css('backgroundColor');
$contents.data("orig-color", origColor); $contents.data("orig-color", origColor);

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

@ -597,7 +597,6 @@ iframe {
.moderator { .moderator {
.topic-body { .topic-body {
background-color: $highlight_background_color; background-color: $highlight_background_color;
border-bottom: 10px solid $highlight_background_color;
} }
} }
@ -762,8 +761,8 @@ blockquote { /* solo quotes */
float: left; float: left;
position: relative; position: relative;
padding: 10px 0 15px 0; padding: 10px 0 15px 0;
.highlighted { &.highlighted {
background-color: $emphasis_background_color !important; background-color: $emphasis_background_color;
} }
img, svg { img, svg {
max-width: 100%; max-width: 100%;
@ -773,7 +772,6 @@ blockquote { /* solo quotes */
.bottom-round.contents.regular { .bottom-round.contents.regular {
-webkit-transition: background-color .25s linear; -webkit-transition: background-color .25s linear;
transition: background-color .25s linear; transition: background-color .25s linear;
} }
.posts-wrapper { .posts-wrapper {