From 550fd6281c83d07b6f988e308ca2b4e356d85c39 Mon Sep 17 00:00:00 2001
From: Allen Rabinovich <allenr@zulip.com>
Date: Thu, 15 Aug 2013 12:38:37 -0700
Subject: [PATCH] Fix regressions associated with the new fixed sidebar layout.

Specifically:

   * Remove min width setting for the main div as it is no longer necessary.
   * Change max width for the app to 1200 and adjust top margin on the message pane

(imported from commit 846dd3dcd7798efa615e15c61681b0ab7465f5e3)
---
 static/js/ui.js         | 1 -
 static/styles/zulip.css | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/static/js/ui.js b/static/js/ui.js
index 493a14b545..a86ccabdf9 100644
--- a/static/js/ui.js
+++ b/static/js/ui.js
@@ -358,7 +358,6 @@ exports.resize_page_components = function () {
     var h = get_new_heights();
 
     $("#bottom_whitespace").height(h.bottom_whitespace_height);
-    $("#main_div").css('min-height', h.main_div_min_height);
     $(".bottom_sidebar").height(h.bottom_sidebar_height);
     $("#right-sidebar").height(h.right_sidebar_height);
     $("#stream_filters").css('max-height', h.stream_filters_max_height);
diff --git a/static/styles/zulip.css b/static/styles/zulip.css
index 1260b7bb3b..e7d9a1e8cf 100644
--- a/static/styles/zulip.css
+++ b/static/styles/zulip.css
@@ -73,7 +73,7 @@ a {
 }
 
 .app-main, .header-main {
-    max-width: 1400px;
+    max-width: 1200px;
     min-width: 950px;
     margin: 0px auto;
     padding: 0px 5px 0px 5px;
@@ -2209,6 +2209,10 @@ div.edit_bot {
     margin-left: 15px;
 }
 
+#home {
+    margin-top: 40px;
+}
+
 #settings-change-box .gravatar-profile {
     width: 60px;
     height: 60px;