From 0776e39668d515fb66b82089200bdc43e8d6b011 Mon Sep 17 00:00:00 2001
From: Neil Williams <neil@reddit.com>
Date: Sun, 9 Dec 2012 13:10:19 -0800
Subject: [PATCH] Move "close window" button to top of in-page popups.

As requested by the vertical-space challenged users of the world.

Also moves the title to the left because it looks better and because the
floated close link was making it off-center.
---
 r2/r2/public/static/css/reddit.css | 11 +++++------
 r2/r2/templates/reddit.html        | 16 ++++++----------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/r2/r2/public/static/css/reddit.css b/r2/r2/public/static/css/reddit.css
index 7501c5410..74326130d 100755
--- a/r2/r2/public/static/css/reddit.css
+++ b/r2/r2/public/static/css/reddit.css
@@ -2198,10 +2198,9 @@ li.searchfacet {
 }
 
 .popup h1 {
-    text-align: center;
-    font-size: large; 
+    font-size: large;
     font-weight: normal;
-    color: orangered;
+    margin-left: 1em;
 }
 
 .popup h2 {
@@ -2212,9 +2211,9 @@ li.searchfacet {
     font-weight: normal;
 }
 
-.popup .close-popup {
-    text-align: center;
-    margin-top: 10px;
+.popup .hidecover {
+    float: right;
+    margin-right: 3px;
 }
 
 .usertable { margin-left: 10px;} 
diff --git a/r2/r2/templates/reddit.html b/r2/r2/templates/reddit.html
index 7e9c39bd3..f83151c79 100644
--- a/r2/r2/templates/reddit.html
+++ b/r2/r2/templates/reddit.html
@@ -146,25 +146,21 @@
         <div class="login-popup cover-overlay" style="display: none">
           <div class="cover" onclick="return hidecover(this)"></div>
           <div class="popup">
+            <a href="#" onclick="return hidecover(this)" class="hidecover">
+              ${_("close this window")}
+            </a>
             <h1 class="cover-msg">${strings.cover_msg}</h1>
             ${login_panel(login_form)}
-            <div class="close-popup">
-              <a href="#" onclick="return hidecover(this)">
-                ${_("close this window")}
-              </a>
-            </div>
           </div>
         </div>
         %endif
         <div class="lang-popup cover-overlay" style="display: none">
           <div class="cover" onclick="return hidecover(this)"></div>
           <div class="popup">
+            <a href="#" onclick="return hidecover(this)" class="hidecover">
+              ${_("close this window")}
+            </a>
             <%include file="prefoptions.html" />
-            <div style="text-align:center; clear:both;">
-              <a href="#" onclick="return hidecover(this)">
-                ${_("close this window")}
-              </a>
-            </div>
           </div>
         </div>
       %endif