Tweaks and changes to adjust for new message block markup

(imported from commit 78210c2b98976243ee1b516bd9400a3071dd8cd9)

static/js/ui.js

@@ -591,11 +591,6 @@ function replace_floating_recipient_bar(desired_label) {
             new_label = $("#current_label_stream");
             other_label = $("#current_label_private_message");
             header = desired_label.children(".message_header_stream");
-
-            $("#current_label_stream .message_header_colorblock").css(
-                "background-color",
-                desired_label.children(".message_header_colorblock")
-                             .css("background-color"));
         } else {
             new_label = $("#current_label_private_message");
             other_label = $("#current_label_stream");
@@ -1851,7 +1846,9 @@ $(function () {
                                "margin-right": (250 + sbWidth) + "px"});
     $("#compose-container").css("max-width", (1400 + sbWidth) + "px");
 
-    $("head").append("<style> @media (max-width: 975px) { .compose-content, .header-main .column-middle { margin-right: " + sbWidth + "px !important; } } </style>");
+    $("head").append("<style> @media (max-width: 975px) { .compose-content, .header-main .column-middle { margin-right: " + (7 + sbWidth) + "px !important; } } " +
+                     "@media (max-width: 775px) { .fixed-app .column-middle { margin-left: " + (7 + sbWidth) + "px !important; } } " +
+                     "</style>");
    }
 
 });

static/styles/zulip.css

@@ -26,19 +26,6 @@ body,
    transition: background-color 200ms linear;
 }
 
-body.narrowed_view {
-    background-color: #effcff;
-   -webkit-transition: background-color 200ms linear;
-   -moz-transition: background-color 200ms linear;
-   -o-transition: background-color 200ms linear;
-   -ms-transition: background-color 200ms linear;
-   transition: background-color 200ms linear;
-}
-
-.narrowed_view .column-middle-inner {
-    background-color: #ffffff;
-}
-
 input,
 button,
 select,
@@ -125,7 +112,7 @@ a {
 }
 
 .app-main .column-left .left-sidebar {
-    width: 250px;
+    width: 242px;
     padding-left: 0px;
 }
 
@@ -134,8 +121,6 @@ a {
 }
 
 .app-main .column-middle {
-    border-left: 1px solid #dadada;
-    border-right: 1px solid #dadada;
     min-height: 100%;
     background-color: #ffffff;
 }
@@ -653,7 +638,6 @@ ul.filters li.out_of_home_view {
      in Firefox only, for some reason; otherwise it gets
      a scrollbar */
     overflow: visible;
-    padding-left: 9px;
 }
 
 
@@ -778,9 +762,10 @@ td.pointer {
     line-height:    14px;
 }
 
-.message_list .recipient_row {
+ .message_list .recipient_row {
-    margin-left: -9px;
+    background: #f1f1f1;
-    margin-right: -9px;
+    border: 1px solid #e2e2e2;
+    margin-bottom: 10px;
 }
 
 .stream_label {
@@ -1042,6 +1027,11 @@ just a temporary hack.
     border-right: none;
 }
 
+.floating_recipient .message_header_private_message {
+    border: 1px solid #e2e2e2;
+    border-bottom: 0px;
+}
+
 .message_header_private_message .message_label_clickable {
     background-color: #444444;
     display: inline-block;
@@ -1072,16 +1062,6 @@ just a temporary hack.
     position: relative;
 }
 
-.private-message .messagebox {
-    margin-left: -9px;
-    margin-right: -9px;
-}
-
-.private-message .messagebox-border {
-    margin-left: 9px;
-    margin-right: 9px;
-}
-
 .private-message .messagebox,
 .message_header_private_message .message-header-contents {
     background-color: #feffe0;
@@ -1266,10 +1246,6 @@ a.message_label_clickable:hover {
     position: relative;
 }
 
-.include-sender .messagebox-border {
-    padding-top: 6px;
-}
-
 .include-sender .message_top_line {
     margin-top: 6px;
 }
@@ -1432,7 +1408,11 @@ blockquote p {
 }
 
 .messagebox-content {
-    padding: 1px 55px 1px 16px;
+    padding: 1px 55px 1px 7px;
+}
+
+.last_message .messagebox-content {
+    padding-bottom: 1px;
 }
 
 .messagebox p {
@@ -2936,9 +2916,6 @@ li.expanded_subject {
 .date_row {
     text-align: center;
     padding-bottom: 10px;
-    margin-left: -9px;
-    margin-right: -9px;
-
 }
 
 .date_row .date-direction {
@@ -3595,7 +3572,6 @@ div.edit_bot {
 
 #home {
     margin-top: 41px;
-    padding-right: 9px;
 }
 
 #home .alert-bar-container {
@@ -3820,7 +3796,7 @@ div.edit_bot {
     }
 
     .compose-content {
-        margin-right: 0px;
+        margin-right: 7px;
     }
 
     .nav .dropdown-menu {
@@ -3835,7 +3811,7 @@ div.edit_bot {
     }
 
     .column-middle {
-        margin-right: 0px;
+        margin-right: 7px;
     }
 
 }
@@ -3881,8 +3857,12 @@ div.edit_bot {
 
     .column-middle,
     .app-main .column-middle {
-        margin-left:  0px;
+        margin-left:  7px;
-        margin-right: 0px;
+        margin-right: 7px;
+    }
+
+    .header-main .column-middle {
+        margin-left: 0px;
     }
 
     .column-middle-inner {
@@ -3904,8 +3884,8 @@ div.edit_bot {
     }
 
     .compose-content {
-        margin-right:15px;
+        margin-right:7px;
-        margin-left: 10px;
+        margin-left: 7px;
     }
 
     #searchbox {

templates/zerver/index.html

@@ -79,11 +79,9 @@ var page_params = {{ page_params }};
                 <div class="column-middle column-overlay recipient-bar-main">
                     <div class="floating_recipient">
                       <div style="display: none;" id="current_label_stream" class="recipient_row">
-                       <div class="message_header_colorblock"></div>
                        <div class="message_label_clickable message_header message_header_stream right_part"></div>
                       </div>
                       <div style="display: none;" id="current_label_private_message" class="recipient_row">
-                        <div class="message_header_colorblock message_header_private_message"></div>
                         <div class="message_label_clickable message_header message_header_private_message right_part"></div>
                       </div>
                     </div>