From 00278b42d8d3d731635af208049ce74e36feff35 Mon Sep 17 00:00:00 2001
From: Kris Aubuchon <shout@k-ris.com>
Date: Thu, 22 May 2014 21:55:50 -0400
Subject: [PATCH] topic list highlight fix, some quote style fixes

---
 .../stylesheets/common/base/onebox.scss       |  9 ++++-
 .../stylesheets/desktop/topic-list.scss       |  4 +--
 .../stylesheets/desktop/topic-post.scss       | 36 +++++++++++--------
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 1bc3c818dc1..3e5c596137d 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -89,7 +89,6 @@ a.loading-onebox {
 }
 
 aside.onebox {
-  margin-top: 15px;
   padding: 12px 25px 12px 12px;
   border-left: 5px solid darken(scale-color-diff(), 10%);
   background: scale-color-diff();
@@ -140,3 +139,11 @@ aside.onebox {
   height: 90px;
   width: 90px;
 }
+
+blockquote {
+  aside.onebox {
+
+        background: darken(scale-color-diff(), 5%);
+        border-left: 5px solid darken(scale-color-diff(), 12%);
+      }
+    }
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 885cf185a5b..aba4507b599 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -68,7 +68,7 @@
 
   > tbody > tr {
     &:nth-child(even) {
-      background-color: rgba($primary, .04);
+        background-color: darken($secondary, 3%);
     }
     &.archived a {
       opacity: 0.6;
@@ -362,7 +362,7 @@
 .category-list-item {
   margin-bottom: 10px;
   #topic-list tbody tr:nth-child(even) {
-    background-color: $secondary;
+    background-color: darken($secondary, 3%);
   }
   th .badge-category {
     float: left;
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 28978c9e642..b0010d65f36 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -271,7 +271,7 @@ nav.post-controls {
     .fa-arrow-up {margin-left: 5px;}
     .row {border-top: 1px solid darken(scale-color-diff(), 10%); padding-top: 7px;}
     .reply:first-of-type .row {border-top: none;}
-
+    .quote {margin-top: 0 !important;}
   background: scale-color-diff();
   .quote .title, blockquote, .onebox, .onebox-result {
     background: darken(scale-color-diff(), 5%);
@@ -467,10 +467,9 @@ a.star {
   clear: left;
   padding: 20px 0 15px 0;
   #topic-list > tbody > tr:nth-child(even) {
-    background-color: rgba($primary, .04);
+    background-color: darken($secondary, 3%);
   }
   #topic-list > tbody > tr:nth-child(odd) {
-    background-color: $secondary;
   }
   table {
     box-shadow: none;
@@ -674,7 +673,7 @@ iframe {
 
 
 blockquote { /* solo quotes */
-  margin: 14px 0;
+  margin: 0;
   padding: 12px;
 
     a.mention {background: scale-color-diff();}
@@ -683,21 +682,30 @@ blockquote { /* solo quotes */
 }
 
 .quote { /* quotes with attribution */
-  margin-top: 14px;
-  blockquote {margin-top: 0; padding-top: 0;
-  .onebox-result {background-color: scale-color-diff();}
-
-
+  blockquote {
+      margin-top: 0;
+      padding-top: 0;
+      p:first-of-type {margin:0;}
+    .onebox-result {
+      background-color: scale-color-diff();
+    }
   }
 
   .title {
-  border-left: 5px solid darken(scale-color-diff(), 10%);
-  background-color: scale-color-diff();
-  padding: 12px;
+    border-left: 5px solid darken(scale-color-diff(), 10%);
+    background-color: scale-color-diff();
+    padding: 12px;
   .avatar { margin-right: 7px; }
-  img {margin-top: -4px;}
+  img { margin-top: -4px; }
+  }
+
+  aside {
+    .quote, .title, blockquote, .onebox, .onebox-result {
+      background: darken(scale-color-diff(), 5%);
+      border-left: 5px solid darken(scale-color-diff(), 12%);
+    }
+  }
 
-}
 }
 
 .quote-controls {