From 1ed4ac3848ad086fea613cdfe0a0b877b9fe9f09 Mon Sep 17 00:00:00 2001
From: Max Goodman <max@reddit.com>
Date: Wed, 20 Nov 2013 23:38:16 -0800
Subject: [PATCH] toolbar: Fix frame sizing with comments pane open.

Since iframes are "replaced elements" they don't auto fill space when a
left and right absolute position is specified. The hacky solution is to
add a container <div> which we can size appropriately and then fill with
the <iframe>.
---
 r2/r2/public/static/css/reddit.less    | 7 ++++---
 r2/r2/templates/innertoolbarframe.html | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/r2/r2/public/static/css/reddit.less b/r2/r2/public/static/css/reddit.less
index 20b8d71f7..0b767356c 100755
--- a/r2/r2/public/static/css/reddit.less
+++ b/r2/r2/public/static/css/reddit.less
@@ -3482,7 +3482,7 @@ body.contact-us-page {
 }
 
 #inner_toolbar {
-    #reddit_panel, #reddit_link {
+    #reddit_panel, #reddit_link_container, #reddit_link {
         position: absolute;
         height: 100%;
         border: none;
@@ -3492,7 +3492,7 @@ body.contact-us-page {
         width: 0;
     }
 
-    #reddit_link {
+    #reddit_link_container, #reddit_link {
         width: 100%;
     }
 
@@ -3501,9 +3501,10 @@ body.contact-us-page {
             width: 400px;
         }
 
-        #reddit_link {
+        #reddit_link_container {
             left: 400px;
             right: 0;
+            width: auto;
         }
     }
 }
diff --git a/r2/r2/templates/innertoolbarframe.html b/r2/r2/templates/innertoolbarframe.html
index 2f8dc930a..80feb249b 100644
--- a/r2/r2/templates/innertoolbarframe.html
+++ b/r2/r2/templates/innertoolbarframe.html
@@ -37,6 +37,8 @@
   </head>
   <body class="${'expanded' if thing.expanded else ''}" id="inner_toolbar" onload="window.frames[1].focus()">
     <iframe frameborder="0" src="${add_sr('/toolbar/comments/'+thing.link._id36)}" id="reddit_panel" name="reddit_panel"></iframe>
-    <iframe frameborder="0" src="${thing.url}" id="reddit_link" name="reddit_link" sandbox="allow-scripts allow-forms allow-same-origin"></iframe>
+    <div id="reddit_link_container">
+      <iframe frameborder="0" src="${thing.url}" id="reddit_link" name="reddit_link" sandbox="allow-scripts allow-forms allow-same-origin"></iframe>
+    </div>
   </body>
 </html>
