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

HTML cleanup since the two compose forms are now unified. 

This also prevents the "bounciness" associated with the fact
that the stream/huddle selector was an absolutely positioned
div relative to the bottom of the compose window.

(imported from commit 413003a83c187efd45d0281f7cb6c9d0bd550674)
This commit is contained in:
Waseem Daher 2012-10-09 11:03:59 -04:00
parent e351439d0b
commit c32a6a4d88
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
templates/zephyr/home.html
View File

@ -23,18 +23,10 @@
<div id="bottom_whitespace"></div> <div id="bottom_whitespace"></div>
</div> </div>
<div class="tabbable zephyr_compose" id="zephyr_compose"> <div class="zephyr_compose" id="zephyr_compose">
<div class="tab-content">
<div class="alert" id="send-status"></div> <div class="alert" id="send-status"></div>
<div class="close composebox-close" onclick="hide_compose()">&times;</div> <div class="close composebox-close" onclick="hide_compose()">&times;</div>
<div id="stream_or_huddle"> <div class="zephyr_comp">
<ul class="nav nav-pills nav-stacked" id="zephyr-type-tabs">
<li class="active"><a href="#class-message" data-toggle="pill">Stream</a></li>
<li><a href="#personal-message" data-toggle="pill">Huddle</a></li>
</ul>
</div>
<div class="tab-pane active">
<div class="zephyr_comp">
<form action="/send_message/" method="post" class="zephyr"> <form action="/send_message/" method="post" class="zephyr">
<input type="hidden" name="type" value="class" id="new_message_type"/> <input type="hidden" name="type" value="class" id="new_message_type"/>
{% csrf_token %} {% csrf_token %}
@ -59,7 +51,14 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="zephyr_picture"></td> <td class="zephyr_picture">
<div id="stream_or_huddle">
<ul class="nav nav-pills nav-stacked" id="zephyr-type-tabs">
<li class="active"><a href="#class-message" data-toggle="pill">Stream</a></li>
<li><a href="#personal-message" data-toggle="pill">Huddle</a></li>
</ul>
</div>
</td>
<td class="pointer"></td> <td class="pointer"></td>
<td class="messagebox"> <td class="messagebox">
<div class="zephyr_content"> <div class="zephyr_content">
@ -71,9 +70,7 @@
</tbody> </tbody>
</table> </table>
</form> </form>
</div>
</div> </div>
</div>
</div> </div>
</div> </div>
</div> </div>

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

@ -341,10 +341,9 @@ input.send_zephyr {
} }
#stream_or_huddle { #stream_or_huddle {
position: absolute; margin: 3px;
bottom: 21px; padding: 5px;
left: 5px; width: 90%;
padding: 0.35em;
border: 1px solid grey; border: 1px solid grey;
} }