From 829346468c71349c9ebd5af7233ed66a3bd243f4 Mon Sep 17 00:00:00 2001
From: Kris Aubuchon <kaubuchon@madpow.net>
Date: Wed, 13 Nov 2013 23:10:47 -0500
Subject: [PATCH 1/2] new onebox style (similar to blockquotes), spacing for
 auto-close message, making link badge easier to read

---
 .../common/components/badges.css.scss         |  6 ++--
 app/assets/stylesheets/desktop/discourse.scss |  1 -
 app/assets/stylesheets/desktop/onebox.scss    | 14 +++++---
 .../stylesheets/desktop/topic-post.scss       | 35 ++++++++++++-------
 app/assets/stylesheets/desktop/topic.scss     |  7 ++--
 5 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss
index 6a84b3eea..507d06573 100644
--- a/app/assets/stylesheets/common/components/badges.css.scss
+++ b/app/assets/stylesheets/common/components/badges.css.scss
@@ -36,7 +36,6 @@
 
 .badge-notification {
   @extend %badge;
-  margin-left: 3px;
   padding: 4px;
   padding-top: 3px;
   color: $white;
@@ -47,6 +46,7 @@
   &[href] {
     color: $white;
   }
+  i {font-size: 10px;}
 
   // New posts
 
@@ -58,7 +58,9 @@
 
   &.clicks {
     font-weight: normal;
-    background-color: rgba($black, 0.15)
+    background-color: #ddd;
+    top: -1px;  
+    color: #666;
   }
 }
 
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index a2261d332..cbfc78b79 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -226,7 +226,6 @@ blockquote {
   background-color: $quote-background;
   border-left: 5px solid darken($quote-background, 20%);
   p {
-    margin: 0 5px 5px 0;
   }
 }
 
diff --git a/app/assets/stylesheets/desktop/onebox.scss b/app/assets/stylesheets/desktop/onebox.scss
index 3c128a6bf..74498136e 100644
--- a/app/assets/stylesheets/desktop/onebox.scss
+++ b/app/assets/stylesheets/desktop/onebox.scss
@@ -12,22 +12,27 @@ a.loading-onebox {
   padding-left: 25px;
 }
 
+
 .onebox-result {
+
+    margin-top: 15px;
+  padding: 12px 25px 12px 12px; 
+  border-left: 5px solid #bebebe;
+  background: #eee;
   font-size: 14px;
   > .source {
-    margin-bottom: 10px;
+    margin-bottom: 12px;
     margin-right: 10px;
-    padding: 0 0 10px 0;
     display: block;
     color: $black;
     position: relative;
-    border-bottom: 1px solid $inner_border;
+    height: 20px;
     .info {
       a {
         color: black;
         text-decoration: none;
+        padding-right: 10px;
       }
-      background-color: $white;
       position: absolute;
       font-size: 14px;
       img.favicon {
@@ -37,7 +42,6 @@ a.loading-onebox {
   }
   .onebox-result-body {
     padding-top: 5px;
-    font-family: Georgia, Times, "Times New Roman", serif;
     img {
       max-width:200px;
     }
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index a6039898b..11abb9dbf 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -347,7 +347,7 @@ a.star {
 }
 
 #topic-footer-buttons {
-  padding: 20px 10px 0 10px;
+  padding: 10px 10px 0 10px;
   p {
     line-height: 32px;
     color: #888;
@@ -479,10 +479,10 @@ iframe {
 }
 
 .contents .cooked {
-  padding-right: 30px;
+  margin-right: 50px;
   word-wrap: break-word;
   h1, h2, h3 {margin: 10px 0;}
-  ul, ol {margin: 0 0 0 20px;}
+  ul, ol {margin: 15px 0 0 20px;}
   li p {margin: 3px 0;}
 }
 
@@ -593,13 +593,30 @@ position: relative;
 blockquote { /* solo quotes */
   margin: 14px 0;
   padding: 12px;
+    p:first-of-type {margin-top: 0;}
+    p:last-of-type {margin-bottom: 0;}
 }
 
 .quote { /* quotes with attribution */
   margin-top: 14px;
-  .title {margin-right: 0;}
-  blockquote {margin: 0;}
+  blockquote {margin-top: 0; padding-top: 0;
+  .onebox-result {background-color: #ddd;}
+
+  
+  }
+
+  .title {
+  border-left: 5px solid #bebebe;
+  background-color: #f1f1f1;
+  padding: 12px;
+  .avatar { margin-right: 7px; }
+  img {margin-top: -4px;}
+
 }
+}
+
+
+
 
 .quote-controls {
   float: right;
@@ -624,13 +641,7 @@ blockquote { /* solo quotes */
     }
 }
 
-.quote .title {
-  border-left: 5px solid #bebebe;
-  background-color: #f1f1f1;
-  padding: 10px 10px 0 12px;
-  .avatar { margin-right: 7px; }
-  img {margin-top: -4px;}
-}
+
 
 .gutter {
   float: left;
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index 3d6992ab2..eb363ce32 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -68,6 +68,8 @@
 
 #topic-closing-info {
   margin-left: 10px;
+  margin-top: 10px;
+  height: 20px; 
 }
 
 #topic-progress-wrapper {
@@ -168,7 +170,7 @@ a:hover.reply-new {
   #topic-progress {
   }
   position: absolute;
-  bottom: -55px;
+  bottom: -70px;
 
 }
 
@@ -190,8 +192,7 @@ a:hover.reply-new {
 .heatmap-med {color: #a00 !important;}
 .heatmap-low {color: #700 !important;}
 
-.onebox-result {margin-top: 15px;}
-.source .info {padding-right: 10px;}
+
 
 #topic-filter {
   background-color: #ffe;

From 5bf2b40dbc2506bbf7b75e748a1a2b5dbba224db Mon Sep 17 00:00:00 2001
From: Kris Aubuchon <kaubuchon@madpow.net>
Date: Wed, 13 Nov 2013 23:19:37 -0500
Subject: [PATCH 2/2] quick fix

---
 app/assets/stylesheets/desktop/topic-post.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 11abb9dbf..1794958c6 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -911,7 +911,7 @@ clear: both;
   }
  article.boxed {
     position: relative;
-    line-height: 20px;
+    line-height: 21px;
 
     .select-posts {
       position: absolute;