Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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)
This commit is contained in:
Waseem Daher 2012-10-15 10:53:48 -04:00
parent d95b4a30e2
commit f3ab2dc5ac
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
templates/zephyr/home.html
View File

@ -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>

11
zephyr/static/styles/zephyr.css
View File

@ -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 {