From f3ab2dc5ac5144098945d3d8d79e2f8e212a0610 Mon Sep 17 00:00:00 2001
From: Waseem Daher <wdaher@humbughq.com>
Date: Mon, 15 Oct 2012 10:53:48 -0400
Subject: [PATCH] Move the floating stream/subject bar into #narrowbox.

This allows us to reposition both of them more cleanly
when we resize things.

(imported from commit a772d2390bd80146e91181e348930559a9e2f4eb)
---
 templates/zephyr/home.html      | 30 ++++++++++++++++--------------
 zephyr/static/styles/zephyr.css | 11 ++++++++---
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/templates/zephyr/home.html b/templates/zephyr/home.html
index 11b2d06fa9..c50d6e149d 100644
--- a/templates/zephyr/home.html
+++ b/templates/zephyr/home.html
@@ -6,20 +6,22 @@
         <span id="currently_narrowed_to"></span>
       </div>
     </div>
-    <table id="fixed_narrowbox">
-      <tr style="visibility: collapse;">
-        <td class="ztable_col1" />
-        <td class="ztable_col2" />
-        <td class="ztable_col3" />
-      </tr>
-      <tr style="display: none;" id="current_label_stream" class="recipient_row">
-        <td colspan="2" class="message_label_clickable message_newstyle_stream"></td>
-        <td class="message_label_clickable message_newstyle_subject"></td>
-      </tr>
-      <tr style="display: none;" id="current_label_huddle" class="recipient_row">
-        <td colspan="3" class="message_label_clickable message_newstyle_pm"></td>
-      </tr>
-    </table>
+    <div class="floating_indicator">
+      <table id="fixed_narrowbox">
+        <tr style="visibility: collapse;">
+          <td class="ztable_col1" />
+          <td class="ztable_col2" />
+          <td class="ztable_col3" />
+        </tr>
+        <tr style="display: none;" id="current_label_stream" class="recipient_row">
+          <td colspan="2" class="message_label_clickable message_newstyle_stream"></td>
+          <td class="message_label_clickable message_newstyle_subject"></td>
+        </tr>
+        <tr style="display: none;" id="current_label_huddle" class="recipient_row">
+          <td colspan="3" class="message_label_clickable message_newstyle_pm"></td>
+        </tr>
+      </table>
+    </div>
   </div>
 </div>
 
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index b7a5b29f37..0ab903bf24 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -331,12 +331,17 @@ input.send_message {
     border: 1px solid black;
 }
 
+.floating_indicator {
+    max-width: 640px;
+    /* from .message_list */
+    padding-left: 10px;
+    padding-right: 20px;
+}
+
 #fixed_narrowbox {
-    position: fixed;
-    /* .message_list width + padding_right - my border*2 - my padding*2 */
-    width: 640px;
     table-layout: fixed;
     margin-left: auto;
+    width: 100%;
 }
 
 #narrowlabel {