You've already forked matrix-react-sdk
							
							
				mirror of
				https://github.com/matrix-org/matrix-react-sdk.git
				synced 2025-11-04 11:51:45 +03:00 
			
		
		
		
	Fix flex values after blur changes
This commit is contained in:
		@@ -24,6 +24,11 @@ $roomListCollapsedWidth: 68px;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.mx_LeftPanel_wrapper {
 | 
			
		||||
    display: flex;
 | 
			
		||||
    max-width: 50%;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.mx_LeftPanel {
 | 
			
		||||
    background-color: $roomlist-bg-color;
 | 
			
		||||
    // TODO decrease this once Spaces launches as it'll no longer need to include the 56px Community Panel
 | 
			
		||||
 
 | 
			
		||||
@@ -33,6 +33,7 @@ limitations under the License.
 | 
			
		||||
    height: 100%;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
.mx_MatrixToolbar {
 | 
			
		||||
    order: 1;
 | 
			
		||||
 | 
			
		||||
@@ -47,9 +48,7 @@ limitations under the License.
 | 
			
		||||
    display: flex;
 | 
			
		||||
 | 
			
		||||
    flex: 1;
 | 
			
		||||
    flex-grow: 0;
 | 
			
		||||
    min-height: 0;
 | 
			
		||||
    max-width: 50%;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.mx_MatrixChat_syncError {
 | 
			
		||||
@@ -65,7 +64,7 @@ limitations under the License.
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* not the left panel, and not the resize handle, so the roomview/groupview/... */
 | 
			
		||||
.mx_MatrixChat > :not(.mx_LeftPanel):not(.mx_SpacePanel):not(.mx_ResizeHandle) {
 | 
			
		||||
.mx_MatrixChat > :not(.mx_LeftPanel):not(.mx_SpacePanel):not(.mx_ResizeHandle):not(.mx_LeftPanel_wrapper) {
 | 
			
		||||
    background-color: $primary-bg-color;
 | 
			
		||||
 | 
			
		||||
    flex: 1 1 0;
 | 
			
		||||
 
 | 
			
		||||
@@ -644,18 +644,20 @@ class LoggedInView extends React.Component<IProps, IState> {
 | 
			
		||||
                    aria-hidden={this.props.hideToSRUsers}
 | 
			
		||||
                >
 | 
			
		||||
                    <ToastContainer />
 | 
			
		||||
                    <div ref={this._resizeContainer} className={bodyClasses}>
 | 
			
		||||
                        <BackdropPanel
 | 
			
		||||
                            backgroundImage={this.state.backgroundImage}
 | 
			
		||||
                        />
 | 
			
		||||
                        { SpaceStore.spacesEnabled ? <SpacePanel /> : null }
 | 
			
		||||
                        <LeftPanel
 | 
			
		||||
                            isMinimized={this.props.collapseLhs || false}
 | 
			
		||||
                            resizeNotifier={this.props.resizeNotifier}
 | 
			
		||||
                        />
 | 
			
		||||
                        <ResizeHandle />
 | 
			
		||||
                    <div className={bodyClasses}>
 | 
			
		||||
                        <div ref={this._resizeContainer} className='mx_LeftPanel_wrapper'>
 | 
			
		||||
                            <BackdropPanel
 | 
			
		||||
                                backgroundImage={this.state.backgroundImage}
 | 
			
		||||
                            />
 | 
			
		||||
                            { SpaceStore.spacesEnabled ? <SpacePanel /> : null }
 | 
			
		||||
                            <LeftPanel
 | 
			
		||||
                                isMinimized={this.props.collapseLhs || false}
 | 
			
		||||
                                resizeNotifier={this.props.resizeNotifier}
 | 
			
		||||
                            />
 | 
			
		||||
                            <ResizeHandle />
 | 
			
		||||
                        </div>
 | 
			
		||||
                        { pageElement }
 | 
			
		||||
                    </div>
 | 
			
		||||
                    { pageElement }
 | 
			
		||||
                </div>
 | 
			
		||||
                <CallContainer />
 | 
			
		||||
                <NonUrgentToastContainer />
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user