Change a number of CSS properties to address various bugs.

This mostly applies to the previous two commits. In principle,
this could be teased out and merged into them, but the hassle
here doesn't totally seem to be worth it.

(imported from commit ee2469ca3762c50c6db49b93eec02b32589eafe3)

templates/zephyr/compose.html

@@ -29,10 +29,9 @@
             <tr class="ztable_layout_row">
               <td class="ztable_comp_col1" />
               <td class="ztable_comp_col2" />
-              <td class="ztable_comp_col3" />
             </tr>
             <tr id="stream-message">
-              <td colspan="2" class="message_header message_header_stream left_part">
+              <td class="message_header message_header_stream left_part">
               </td>
               <td class="message_header message_header_stream right_part">
                   <span id="compose-lock-icon">
@@ -48,14 +47,13 @@
               </td>
             </tr>
             <tr id="private-message">
-              <td colspan="2" class="message_header message_header_private_message left_part"></td>
+              <td class="message_header_private_message message_header left_part"></td>
-              <td class="message_header message_header_private_message right_part dark_background">
+              <td class="message_header_private_message message_header right_part dark_background">
                 You and <input type="text" class="recipient_box" name="recipient" id="private_message_recipient"
                                value="" placeholder="one or more people..." autocomplete="off" tabindex="130"/>
               </td>
             </tr>
             <tr>
-              <td class="pointer"></td>
               <td id="left-of-compose">
                 <div>
                   <input type="file" id="file_input" class="notvisible pull-left" multiple />

zephyr/static/styles/zephyr.css

@@ -59,9 +59,6 @@ input[type="color"]
 
 li, .table th, .table td {
     line-height: inherit;
-    background-clip: content-box;
-    -webkit-background-clip: content;
-    -moz-background-clip: content;
 }
 
 .btn {
@@ -444,6 +441,11 @@ td.pointer {
     visibility: visible;
 }
 
+
+.private-message .messagebox {
+background-color: #feffe0;
+}
+
 .selected_message.private-message .message_data, .selected_message.private-message .messagebox {
     background-color: #feffcc;
 }
@@ -526,11 +528,11 @@ td.pointer {
 }
 
 .ztable_comp_col1 {
-    width: 8px;
+    width: 40px;
 }
 
 .ztable_comp_col2 {
-    
+    width: 100%;
 }
 
 .message_header {
@@ -573,19 +575,16 @@ td.pointer {
     border-bottom: 1px solid #d2eee7;
 }
 
-.messagebox.last_message {
+.last_message .messagebox {
     height: 3px;
-    background-color: #fff;
     border-radius: 0px 0px 3px 0px;
-    /* box-shadow: 0px 2px 2px -1px #ccc; */
     border: 1px solid #c1dbd5;
     border-top: none;
     border-left: none;
 }
 
-.messagebox_colorblock.last_message {
+.last_message .messagebox_colorblock {
     border-radius: 0px 0px 0px 3px;
-    /* box-shadow: 0px 2px 2px -1px #ccc; */
     border: 1px solid #c1dbd5;
     border-top: none;
     border-right: none;
@@ -597,8 +596,15 @@ td.pointer {
     border-bottom: 1px solid #d2eee7;
 }
 
-.message_header_private_message {
+.compose_table .message_header.message_header_private_message, .message_header_private_message {
-    background-color: #444;
+    background-color: #444444;
+}
+
+.compose_table .message_header {
+    background: none;
+    background-color: #ececec;
+    border: none;
+    border-radius: 0px;
 }
 
 .selected_message .messagebox_colorblock {
@@ -616,6 +622,10 @@ td.pointer {
     display: inline-block;
 }
 
+.mention .messagebox {
+background-color: #ffe4e0;
+}
+
 .selected_message.mention .messagebox, .selected_message.mention .message_data {
     background-color: #FFE0DC;
 }

zephyr/static/templates/message.handlebars

@@ -51,10 +51,9 @@
 {{/if}}
 {{/include_recipient}}
 <tr zid="{{id}}" id="{{dom_id}}"
-
+    class="message_row{{^is_stream}} private-message{{/is_stream}}{{#include_sender}} include-sender{{/include_sender}}{{#contains_mention}} mention{{/contains_mention}}{{#include_footer}} last_message{{/include_footer}}">
-    class="message_row{{^is_stream}} private-message{{/is_stream}}{{#include_sender}} include-sender{{/include_sender}}{{#contains_mention}} mention{{/contains_mention}}">
+        <td class="messagebox_colorblock{{^is_stream}} message_header_private_message{{/is_stream}}" style="background-color: {{background_color}};"><span class="pointer_icon"><i class="icon-vector-caret-right"></i></span></td>
-        <td class="messagebox_colorblock{{^is_stream}} message_header_private_message{{/is_stream}}{{#include_footer}} last_message{{/include_footer}}" style="background-color: {{background_color}};"><span class="pointer_icon"><i class="icon-vector-caret-right"></i></span></td>
+        <td class="messagebox{{^include_sender}} prev_is_same_sender{{/include_sender}}{{^is_stream}} private-message{{/is_stream}}">
-        <td class="messagebox{{^include_sender}} prev_is_same_sender{{/include_sender}}{{^is_stream}} private-message{{/is_stream}}{{#include_footer}} last_message{{/include_footer}}">
         <div class="message_top_line">
         {{#include_sender}}
         <span class="message_sender actions_hover">