mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-04 05:53:43 +00:00 
			
		
		
		
	css: Fix fluid_layout_width setting.
0457f6807c seems to have accidentally
inverted the setting; we also clean up duplicate declarations of this
1400px value.
			
			
This commit is contained in:
		@@ -233,8 +233,6 @@
 | 
				
			|||||||
    display: flex;
 | 
					    display: flex;
 | 
				
			||||||
    flex-direction: column;
 | 
					    flex-direction: column;
 | 
				
			||||||
    width: 100%;
 | 
					    width: 100%;
 | 
				
			||||||
    /* This should match the value for .app-main */
 | 
					 | 
				
			||||||
    max-width: 1400px;
 | 
					 | 
				
			||||||
    margin: auto;
 | 
					    margin: auto;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -29,12 +29,19 @@ body {
 | 
				
			|||||||
    background-color: var(--color-background);
 | 
					    background-color: var(--color-background);
 | 
				
			||||||
    transition: background-color 200ms linear;
 | 
					    transition: background-color 200ms linear;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    &.fluid_layout_width {
 | 
					    /* Implementation for fluid layout width setting. */
 | 
				
			||||||
    .header-main,
 | 
					    .header-main,
 | 
				
			||||||
    .app .app-main,
 | 
					    .app .app-main,
 | 
				
			||||||
    #compose-container {
 | 
					    #compose-container {
 | 
				
			||||||
        max-width: 1400px;
 | 
					        max-width: 1400px;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    &.fluid_layout_width {
 | 
				
			||||||
 | 
					        .header-main,
 | 
				
			||||||
 | 
					        .app .app-main,
 | 
				
			||||||
 | 
					        #compose-container {
 | 
				
			||||||
 | 
					            max-width: inherit;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -540,10 +547,6 @@ p.n-margin {
 | 
				
			|||||||
.app-main,
 | 
					.app-main,
 | 
				
			||||||
.header-main {
 | 
					.header-main {
 | 
				
			||||||
    width: 100%;
 | 
					    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;
 | 
					    min-width: 950px;
 | 
				
			||||||
    margin: 0 auto;
 | 
					    margin: 0 auto;
 | 
				
			||||||
    padding: 0;
 | 
					    padding: 0;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user