paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-09 00:18:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make text-underneath-compose-box all nicely line up together.

Browse Source 
(imported from commit d4676d95ccad18f65a29447647581b41d53dfa9a)
This commit is contained in:
Waseem Daher
2013-04-24 17:44:25 -04:00
parent 3bb3bbb1ee
commit ccc5363f3c
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
templates/zephyr/compose.html
View File

@@ -49,15 +49,13 @@
</div> </div>
</div> </div>
<div id="below-compose-content"> <div id="below-compose-content">
<input type="file" id="file_input" class="notvisible" multiple /> <input type="file" id="file_input" class="notvisible pull-left" multiple />
<a class="message-control-button icon-vector-paper-clip notdisplayed" id="attach_files" href="#" title="Attach files"></a> <a class="message-control-button icon-vector-paper-clip notdisplayed" id="attach_files" href="#" title="Attach files"></a>
<span id="restore-draft" onclick="compose.restore_message();">Restore last draft?</span> <a id="restore-draft" onclick="compose.restore_message();">Restore last draft?</a>
<span id="tab-enter-message"> <span id="sending-indicator">Sending...</span>
<span id="sending-indicator">Sending...</span> <label class="pull-right inline">Press Enter to send&nbsp;
<label class="pull-right inline">Press Enter to send&nbsp; <input type="checkbox" id="enter_sends" name="enter_sends" value="ender_sends" />
<input type="checkbox" id="enter_sends" name="enter_sends" value="ender_sends" /> </label>
</label>
</span>
</div> </div>
</td> </td>
</tr> </tr>

4
zephyr/static/js/compose.js
View File

@@ -204,7 +204,7 @@ exports.start = function (msg_type, opts) {
} }
if (message_snapshot !== undefined) { if (message_snapshot !== undefined) {
$('#restore-draft').css('visibility', 'visible'); $('#restore-draft').show();
} }
if (opts.replying_to_message !== undefined) { if (opts.replying_to_message !== undefined) {
@@ -266,7 +266,7 @@ exports.snapshot_message = function(message) {
}; };
function clear_message_snapshot() { function clear_message_snapshot() {
$("#restore-draft").css("visibility", "hidden"); $("#restore-draft").hide();
message_snapshot = undefined; message_snapshot = undefined;
} }

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

@@ -1158,7 +1158,9 @@ li.expanded_subject {
} }
#restore-draft { #restore-draft {
visibility: hidden; float: left;
display: none;
margin-right: 1em;
} }
#restore-draft:hover { #restore-draft:hover {
@@ -1175,6 +1177,7 @@ li.expanded_subject {
margin-right: 5px; margin-right: 5px;
border-radius: 2px; border-radius: 2px;
text-align: center; text-align: center;
float: left;
} }
#compose a.message-control-button:hover { #compose a.message-control-button:hover {