From 8bcdf103bad3e4c4a4927b85efe34f41afe765d5 Mon Sep 17 00:00:00 2001
From: spez <steve@reddit.com>
Date: Thu, 4 Dec 2008 22:07:00 -0500
Subject: [PATCH] some sponsored link style changes

---
 r2/r2/models/link.py              |  3 ++-
 r2/r2/public/static/animate.js    |  2 +-
 r2/r2/public/static/reddit.css    | 20 +++++++++-----------
 r2/r2/templates/promotedlink.html |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py
index 18a95fd4d..833eee6e8 100644
--- a/r2/r2/models/link.py
+++ b/r2/r2/models/link.py
@@ -246,7 +246,8 @@ class Link(Thing, Printable):
 
         for item in wrapped:
             show_media = (c.user.pref_media == 'on' or
-                          (item.promoted and item.has_thumbnail) or
+                          (item.promoted and item.has_thumbnail
+                           and c.user.pref_media != 'off') or
                           (c.user.pref_media == 'subreddit' and
                            item.subreddit.show_media))
 
diff --git a/r2/r2/public/static/animate.js b/r2/r2/public/static/animate.js
index 7b8aca061..dff92e4f6 100644
--- a/r2/r2/public/static/animate.js
+++ b/r2/r2/public/static/animate.js
@@ -5,7 +5,7 @@ var _duration = 750; /* ms */
 var _ani_speeds = {slow: 2* _duration,
                    medium: _duration,
                    fast: _duration/2,
-                   veryfast: _duration/8};
+                   veryfast: _duration/4};
 
 function __animate() {
     var a = aniqueue ? aniqueue[0] : [];
diff --git a/r2/r2/public/static/reddit.css b/r2/r2/public/static/reddit.css
index a1f8e09f3..55f0cdefd 100644
--- a/r2/r2/public/static/reddit.css
+++ b/r2/r2/public/static/reddit.css
@@ -546,7 +546,7 @@ before enabling */
 
 /* organic listing */
 .organic-listing { 
-    border: solid 1px #666666;
+    border: solid 1px gray;
     padding: 0;
     overflow: hidden; 
     position: relative;
@@ -580,7 +580,7 @@ before enabling */
 
 .promoted {
     background-color: #EFF7FF;
-    border: solid 1px;
+    border: 1px solid gray;
     padding: 5px 0 5px 0;
     overflow: hidden;
     position: relative;
@@ -596,16 +596,16 @@ before enabling */
 }
 
 .organic-listing .sponsored-tagline {
+    right: 6.4em;
+}
+
+.sponsored-tagline { 
     color: #808080;
     bottom: 0;
     margin: 0 5px 5px 0;
     position: absolute;
-    right: 6.3em;
-    display: block;
-}
-
-.sponsored-tagline {
-    display: none;
+    font-weight: bold;
+    right: 0;
 }
 
 .promote-pixel {
@@ -985,9 +985,7 @@ a.star { text-decoration: none; color: #ff8b60 }
 
 
 .login-form-side { 
-    border: gray solid 1px;
-    border-bottom: black solid 1px;
-    border-right: black solid 1px;
+    border: 1px solid gray;
 }
 
 .login-form-side input { 
diff --git a/r2/r2/templates/promotedlink.html b/r2/r2/templates/promotedlink.html
index 283458875..79df5b367 100644
--- a/r2/r2/templates/promotedlink.html
+++ b/r2/r2/templates/promotedlink.html
@@ -32,7 +32,7 @@
 <%def name="entry()">
   ${parent.entry()}
   <p class="sponsored-tagline">
-    ${_('sponsored link')} |
+    ${_('sponsored link')}
   </p>
   <img class="promote-pixel"
    id="promote_img_${thing._fullname}"