From 1f8b3fd09a0b8cca2f815ffbd77b9fffbbce7e2e Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulip.com>
Date: Sun, 28 May 2023 22:03:33 -0700
Subject: [PATCH] css: Fix fluid_layout_width setting.

0457f6807c9c1e925a7e5b0704685fcc0d97c936 seems to have accidentally
inverted the setting; we also clean up duplicate declarations of this
1400px value.
---
 web/styles/compose.css |  2 --
 web/styles/zulip.css   | 13 ++++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/web/styles/compose.css b/web/styles/compose.css
index 0c146d38f6..6399d5ed0b 100644
--- a/web/styles/compose.css
+++ b/web/styles/compose.css
@@ -233,8 +233,6 @@
     display: flex;
     flex-direction: column;
     width: 100%;
-    /* This should match the value for .app-main */
-    max-width: 1400px;
     margin: auto;
 }
 
diff --git a/web/styles/zulip.css b/web/styles/zulip.css
index 3fe26443e5..eb44217488 100644
--- a/web/styles/zulip.css
+++ b/web/styles/zulip.css
@@ -29,11 +29,18 @@ body {
     background-color: var(--color-background);
     transition: background-color 200ms linear;
 
+    /* Implementation for fluid layout width setting. */
+    .header-main,
+    .app .app-main,
+    #compose-container {
+        max-width: 1400px;
+    }
+
     &.fluid_layout_width {
         .header-main,
         .app .app-main,
         #compose-container {
-            max-width: 1400px;
+            max-width: inherit;
         }
     }
 }
@@ -540,10 +547,6 @@ p.n-margin {
 .app-main,
 .header-main {
     width: 100%;
-    /* `max-width` is changed based on `fluid_layout_width` setting in
-       `scroll_bar.js`. User may or may not see a flash of mispositioned content
-       based on how quickly the JS code is executed. */
-    max-width: 1400px;
     min-width: 950px;
     margin: 0 auto;
     padding: 0;