matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-03 00:33:22 +03:00
Code Activity

Fix flex values after blur changes

Browse Source
This commit is contained in:
Dariusz Niemczyk
2021-08-19 16:10:09 +02:00
parent 5a1633d53c
commit f5a284a1f0
3 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/css/structures/_LeftPanel.scss
View File

@@ -24,6 +24,11 @@ $roomListCollapsedWidth: 68px;
} }
} }
.mx_LeftPanel_wrapper {
display: flex;
max-width: 50%;
}
.mx_LeftPanel { .mx_LeftPanel {
background-color: $roomlist-bg-color; background-color: $roomlist-bg-color;
// 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

5
res/css/structures/_MatrixChat.scss
View File

@@ -33,6 +33,7 @@ limitations under the License.
height: 100%; height: 100%;
} }
.mx_MatrixToolbar { .mx_MatrixToolbar {
order: 1; order: 1;
@@ -47,9 +48,7 @@ limitations under the License.
display: flex; display: flex;
flex: 1; flex: 1;
flex-grow: 0;
min-height: 0; min-height: 0;
max-width: 50%;
} }
.mx_MatrixChat_syncError { .mx_MatrixChat_syncError {
@@ -65,7 +64,7 @@ limitations under the License.
} }
/* not the left panel, and not the resize handle, so the roomview/groupview/... */ /* 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; background-color: $primary-bg-color;
flex: 1 1 0; flex: 1 1 0;

24
src/components/structures/LoggedInView.tsx
View File

@@ -644,18 +644,20 @@ class LoggedInView extends React.Component<IProps, IState> {
aria-hidden={this.props.hideToSRUsers} aria-hidden={this.props.hideToSRUsers}
> >
<ToastContainer /> <ToastContainer />
<div ref={this._resizeContainer} className={bodyClasses}> <div className={bodyClasses}>
<BackdropPanel <div ref={this._resizeContainer} className='mx_LeftPanel_wrapper'>
backgroundImage={this.state.backgroundImage} <BackdropPanel
/> backgroundImage={this.state.backgroundImage}
{ SpaceStore.spacesEnabled ? <SpacePanel /> : null } />
<LeftPanel { SpaceStore.spacesEnabled ? <SpacePanel /> : null }
isMinimized={this.props.collapseLhs || false} <LeftPanel
resizeNotifier={this.props.resizeNotifier} isMinimized={this.props.collapseLhs || false}
/> resizeNotifier={this.props.resizeNotifier}
<ResizeHandle /> />
<ResizeHandle />
</div>
{ pageElement }
</div> </div>
{ pageElement }
</div> </div>
<CallContainer /> <CallContainer />
<NonUrgentToastContainer /> <NonUrgentToastContainer />