You've already forked matrix-react-sdk
							
							
				mirror of
				https://github.com/matrix-org/matrix-react-sdk.git
				synced 2025-11-03 00:33:22 +03:00 
			
		
		
		
	Properly sepearate left column from timeline
This commit is contained in:
		@@ -17,6 +17,7 @@
 | 
				
			|||||||
@import "./structures/_LeftPanelWidget.scss";
 | 
					@import "./structures/_LeftPanelWidget.scss";
 | 
				
			||||||
@import "./structures/_MainSplit.scss";
 | 
					@import "./structures/_MainSplit.scss";
 | 
				
			||||||
@import "./structures/_MatrixChat.scss";
 | 
					@import "./structures/_MatrixChat.scss";
 | 
				
			||||||
 | 
					@import "./structures/_BackdropPanel.scss";
 | 
				
			||||||
@import "./structures/_MyGroups.scss";
 | 
					@import "./structures/_MyGroups.scss";
 | 
				
			||||||
@import "./structures/_NonUrgentToastContainer.scss";
 | 
					@import "./structures/_NonUrgentToastContainer.scss";
 | 
				
			||||||
@import "./structures/_NotificationPanel.scss";
 | 
					@import "./structures/_NotificationPanel.scss";
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										33
									
								
								res/css/structures/_BackdropPanel.scss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										33
									
								
								res/css/structures/_BackdropPanel.scss
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,33 @@
 | 
				
			|||||||
 | 
					/*
 | 
				
			||||||
 | 
					Copyright 2021 New Vector Ltd
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Licensed under the Apache License, Version 2.0 (the "License");
 | 
				
			||||||
 | 
					you may not use this file except in compliance with the License.
 | 
				
			||||||
 | 
					You may obtain a copy of the License at
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    http://www.apache.org/licenses/LICENSE-2.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Unless required by applicable law or agreed to in writing, software
 | 
				
			||||||
 | 
					distributed under the License is distributed on an "AS IS" BASIS,
 | 
				
			||||||
 | 
					WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
				
			||||||
 | 
					See the License for the specific language governing permissions and
 | 
				
			||||||
 | 
					limitations under the License.
 | 
				
			||||||
 | 
					*/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.mx_BackdropPanel {
 | 
				
			||||||
 | 
					  position: absolute;
 | 
				
			||||||
 | 
					  left: 0;
 | 
				
			||||||
 | 
					  top: 0;
 | 
				
			||||||
 | 
					  height: 100vh;
 | 
				
			||||||
 | 
					  width: 100%;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.mx_BackdropPanel--canvas {
 | 
				
			||||||
 | 
					    position: absolute;
 | 
				
			||||||
 | 
					    top: 0;
 | 
				
			||||||
 | 
					    left: 0;
 | 
				
			||||||
 | 
					    min-height: 100%;
 | 
				
			||||||
 | 
					    z-index: 0;
 | 
				
			||||||
 | 
					    pointer-events: none;
 | 
				
			||||||
 | 
					    overflow: hidden;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -20,7 +20,6 @@ $roomListCollapsedWidth: 68px;
 | 
				
			|||||||
.mx_LeftPanel {
 | 
					.mx_LeftPanel {
 | 
				
			||||||
    // TODO decrease this once Spaces launches as it'll no longer need to include the 56px Community Panel
 | 
					    // TODO decrease this once Spaces launches as it'll no longer need to include the 56px Community Panel
 | 
				
			||||||
    min-width: 206px;
 | 
					    min-width: 206px;
 | 
				
			||||||
    max-width: 50%;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Create a row-based flexbox for the GroupFilterPanel and the room list
 | 
					    // Create a row-based flexbox for the GroupFilterPanel and the room list
 | 
				
			||||||
    display: flex;
 | 
					    display: flex;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -29,22 +29,10 @@ limitations under the License.
 | 
				
			|||||||
.mx_MatrixChat_wrapper {
 | 
					.mx_MatrixChat_wrapper {
 | 
				
			||||||
    display: flex;
 | 
					    display: flex;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    flex-direction: column;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    width: 100%;
 | 
					    width: 100%;
 | 
				
			||||||
    height: 100%;
 | 
					    height: 100%;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.mx_BackdropPanel {
 | 
					 | 
				
			||||||
    position: absolute;
 | 
					 | 
				
			||||||
    top: 0;
 | 
					 | 
				
			||||||
    left: 0;
 | 
					 | 
				
			||||||
    min-height: 100%;
 | 
					 | 
				
			||||||
    z-index: 0;
 | 
					 | 
				
			||||||
    pointer-events: none;
 | 
					 | 
				
			||||||
    overflow: hidden;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
.mx_MatrixToolbar {
 | 
					.mx_MatrixToolbar {
 | 
				
			||||||
    order: 1;
 | 
					    order: 1;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -57,10 +45,10 @@ limitations under the License.
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    display: flex;
 | 
					    display: flex;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    order: 2;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    flex: 1;
 | 
					    flex: 1;
 | 
				
			||||||
 | 
					    flex-grow: 0;
 | 
				
			||||||
    min-height: 0;
 | 
					    min-height: 0;
 | 
				
			||||||
 | 
					    max-width: 50%;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.mx_MatrixChat_syncError {
 | 
					.mx_MatrixChat_syncError {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,6 +18,8 @@ limitations under the License.
 | 
				
			|||||||
    word-wrap: break-word;
 | 
					    word-wrap: break-word;
 | 
				
			||||||
    display: flex;
 | 
					    display: flex;
 | 
				
			||||||
    flex-direction: column;
 | 
					    flex-direction: column;
 | 
				
			||||||
 | 
					    flex: 1;
 | 
				
			||||||
 | 
					    position: relative;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -131,10 +131,10 @@ export default class BackdropPanel extends React.PureComponent<IProps> {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    public render() {
 | 
					    public render() {
 | 
				
			||||||
        if (!this.props.backgroundImage) return null;
 | 
					        if (!this.props.backgroundImage) return null;
 | 
				
			||||||
        return <div>
 | 
					        return <div className="mx_BackdropPanel">
 | 
				
			||||||
            <canvas
 | 
					            <canvas
 | 
				
			||||||
                ref={this.spacesCanvasRef}
 | 
					                ref={this.spacesCanvasRef}
 | 
				
			||||||
                className="mx_BackdropPanel"
 | 
					                className="mx_BackdropPanel--canvas"
 | 
				
			||||||
                style={{
 | 
					                style={{
 | 
				
			||||||
                    opacity: .19,
 | 
					                    opacity: .19,
 | 
				
			||||||
                }}
 | 
					                }}
 | 
				
			||||||
@@ -145,7 +145,7 @@ export default class BackdropPanel extends React.PureComponent<IProps> {
 | 
				
			|||||||
                    opacity: .12,
 | 
					                    opacity: .12,
 | 
				
			||||||
                }}
 | 
					                }}
 | 
				
			||||||
                ref={this.roomListCanvasRef}
 | 
					                ref={this.roomListCanvasRef}
 | 
				
			||||||
                className="mx_BackdropPanel"
 | 
					                className="mx_BackdropPanel--canvas"
 | 
				
			||||||
            />
 | 
					            />
 | 
				
			||||||
        </div>;
 | 
					        </div>;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -644,8 +644,8 @@ class LoggedInView extends React.Component<IProps, IState> {
 | 
				
			|||||||
                            resizeNotifier={this.props.resizeNotifier}
 | 
					                            resizeNotifier={this.props.resizeNotifier}
 | 
				
			||||||
                        />
 | 
					                        />
 | 
				
			||||||
                        <ResizeHandle />
 | 
					                        <ResizeHandle />
 | 
				
			||||||
                        { pageElement }
 | 
					 | 
				
			||||||
                    </div>
 | 
					                    </div>
 | 
				
			||||||
 | 
					                    { pageElement }
 | 
				
			||||||
                </div>
 | 
					                </div>
 | 
				
			||||||
                <CallContainer />
 | 
					                <CallContainer />
 | 
				
			||||||
                <NonUrgentToastContainer />
 | 
					                <NonUrgentToastContainer />
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user